From 3144d221ccd35979cc1d78b1263cf03a5902a361 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 22 Aug 2016 09:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 4 ++-- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 2 +- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 2 +- .../com/lyms/platform/operate/web/facade/PostReviewFacade.java | 2 +- .../com/lyms/platform/operate/web/result/HighScoreResult.java | 8 ++++++++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 0ca9447..bb312d8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -395,7 +395,7 @@ public class AntenatalExaminationFacade { for (Patients patients : list) { HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); - antexListResult.setRiskScore(highScoreResult.getScore() + ""); + antexListResult.setRiskScore(highScoreResult.getScoreStr()); List data = new ArrayList<>(); MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); @@ -650,7 +650,7 @@ public class AntenatalExaminationFacade { antexListResult.setData(handlAntData(antExChulist, list)); antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); - antexListResult.setRiskScore(highScoreResult.getScore() + ""); + antexListResult.setRiskScore(highScoreResult.getScoreStr()); int days = DateUtil.getDays(patients.getLastMenses(), new Date()); // 28孕周（28+1—28+6） if ((days >= 197) && days <= 202) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 477523d..b4fc828 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -485,7 +485,7 @@ public class MatDeliverFacade { } matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk()); - matDeliverListResult.setRiskScore(highScoreResult.getScore() + ""); + matDeliverListResult.setRiskScore(highScoreResult.getScoreStr()); matDeliverListResult.setTireNumber1(tTireNumber); } catch (Exception e) { } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 1623167..1681d12 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -249,7 +249,7 @@ public class PatientFacade { try { HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(),false); patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); - patientBaseResult.setRiskScore(highScoreResult.getScore() + ""); + patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); } catch (Exception e) { } return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 00767b7..ffb66fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -161,7 +161,7 @@ public class PostReviewFacade { postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); postReviewListResult.setData(dataList); postReviewListResult.setRiskFactor(highScoreResult.getHighRisk()); - postReviewListResult.setRiskScore(highScoreResult.getScore()+""); + postReviewListResult.setRiskScore(highScoreResult.getScoreStr()); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java index 4ff6a4c..1ad2387 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java @@ -41,6 +41,14 @@ public class HighScoreResult { return score; } + + public String getScoreStr(){ + if(null==score){ + return ""; + } + return score+""; + } + public List getLevelId() { if (null == level) { return Collections.emptyList(); -- 1.8.3.1