fangyeqing / xkl-interface · Commits

Go to a project

Authored by zhaoyue
Commit 7db968336990cf1cfe7c91ee3c49d6afb2032dfc 2 parents 6cff1928 cbb2a4a9

Merge branch 'zhaoyue-dev2' into 'master' 

rm trim



See merge request !32
Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
... ... @@ -2,7 +2,7 @@ git pull
git add --all src/main/java/*
git add push.sh
git add pom.xml
git commit -m "add trim"
git commit -m "rm trim"
#git push origin master
git push origin zhaoyue-dev2
git status
... ...
... ... @@ -169,8 +169,8 @@ public class ReportService implements IReportService {
if (age < 0 || age > 127) {
return null;
}
ampReport.setReport(rpJson.getString("name").trim(),
rpJson.getString("title").trim(),/// "AMP快速无创身心健康评估报告",
ampReport.setReport(rpJson.getString("name"),
rpJson.getString("title"),/// "AMP快速无创身心健康评估报告",
new Timestamp(rpJson.getLong("report_date")),
new Timestamp(System.currentTimeMillis()),
rpJson.getString("account").trim(),///
... ... @@ -187,13 +187,13 @@ public class ReportService implements IReportService {
rpJson.getDouble("ABD").doubleValue(),
rpJson.getDouble("total").doubleValue(),
rpJson.getInteger("stable").intValue(),
md5, rpJson.getString("machine_num").trim(),
rpJson.getString("basic_result").trim(),
rpJson.getString("T0").trim(),
rpJson.getString("T1").trim(),
rpJson.getString("T2").trim(),
rpJson.getString("T3").trim(),
rpJson.getString("T4").trim()
md5, rpJson.getString("machine_num"),
rpJson.getString("basic_result"),
rpJson.getString("T0"),
rpJson.getString("T1"),
rpJson.getString("T2"),
rpJson.getString("T3"),
rpJson.getString("T4")
);
/*
* 3. 获取detail信息，id，float类型
... ...