Authored by zhaoyue

add trim

@@ -2,7 +2,7 @@ git pull @@ -2,7 +2,7 @@ git pull
2 git add --all src/main/java/* 2 git add --all src/main/java/*
3 git add push.sh 3 git add push.sh
4 git add pom.xml 4 git add pom.xml
5 -git commit -m "add log info" 5 +git commit -m "add trim"
6 #git push origin master 6 #git push origin master
7 git push origin zhaoyue-dev2 7 git push origin zhaoyue-dev2
8 git status 8 git status
@@ -169,11 +169,11 @@ public class ReportService implements IReportService { @@ -169,11 +169,11 @@ public class ReportService implements IReportService {
169 if (age < 0 || age > 127) { 169 if (age < 0 || age > 127) {
170 return null; 170 return null;
171 } 171 }
172 - ampReport.setReport(rpJson.getString("name"),  
173 - rpJson.getString("title"),/// "AMP快速无创身心健康评估报告", 172 + ampReport.setReport(rpJson.getString("name").trim(),
  173 + rpJson.getString("title").trim(),/// "AMP快速无创身心健康评估报告",
174 new Timestamp(rpJson.getLong("report_date")), 174 new Timestamp(rpJson.getLong("report_date")),
175 new Timestamp(System.currentTimeMillis()), 175 new Timestamp(System.currentTimeMillis()),
176 - rpJson.getString("account"),/// 176 + rpJson.getString("account").trim(),///
177 rpJson.getInteger("sex").byteValue(),/// 177 rpJson.getInteger("sex").byteValue(),///
178 rpJson.getInteger("age").byteValue(), 178 rpJson.getInteger("age").byteValue(),
179 rpJson.getInteger("weight").intValue(), 179 rpJson.getInteger("weight").intValue(),
@@ -187,13 +187,13 @@ public class ReportService implements IReportService { @@ -187,13 +187,13 @@ public class ReportService implements IReportService {
187 rpJson.getDouble("ABD").doubleValue(), 187 rpJson.getDouble("ABD").doubleValue(),
188 rpJson.getDouble("total").doubleValue(), 188 rpJson.getDouble("total").doubleValue(),
189 rpJson.getInteger("stable").intValue(), 189 rpJson.getInteger("stable").intValue(),
190 - md5, rpJson.getString("machine_num"),  
191 - rpJson.getString("basic_result"),  
192 - rpJson.getString("T0"),  
193 - rpJson.getString("T1"),  
194 - rpJson.getString("T2"),  
195 - rpJson.getString("T3"),  
196 - rpJson.getString("T4") 190 + md5, rpJson.getString("machine_num").trim(),
  191 + rpJson.getString("basic_result").trim(),
  192 + rpJson.getString("T0").trim(),
  193 + rpJson.getString("T1").trim(),
  194 + rpJson.getString("T2").trim(),
  195 + rpJson.getString("T3").trim(),
  196 + rpJson.getString("T4").trim()
197 ); 197 );
198 /* 198 /*
199 * 3. 获取detail信息,id,float类型 199 * 3. 获取detail信息,id,float类型