From cc0f987bf9c9ecafe663f18e45922f804ff51e90 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 15 Aug 2016 16:00:08 +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 --- .../operate/web/facade/AntenatalExaminationFacade.java | 14 +++++++++----- .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 2 +- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 2 +- .../lyms/platform/operate/web/facade/PatientFacade.java | 6 +++--- .../lyms/platform/operate/web/facade/PostReviewFacade.java | 2 +- 5 files changed, 15 insertions(+), 11 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 496ae0d..3d2605c 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 @@ -19,6 +19,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.*; @@ -229,8 +230,11 @@ public class AntenatalExaminationFacade { * * @return */ - public HighScoreResult findLastRisk(String parentId, boolean needLevel) { - List list = antenatalExaminationService.findAllByParentId(parentId); + public HighScoreResult findLastRisk(String pid, boolean needLevel) { + AntExQuery antExQuery=new AntExQuery(); + antExQuery.setPid(pid); + antExQuery.setYn(YnEnums.YES.getId()); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified")); HighScoreResult highScoreResult = new HighScoreResult(); boolean next = true; if (CollectionUtils.isNotEmpty(list)) { @@ -286,7 +290,7 @@ public class AntenatalExaminationFacade { if (next) { //初诊 AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setParentId(parentId); + antExChuQuery.setPid(pid); antExChuQuery.setYn(YnEnums.YES.getId()); List list1 = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(list1)) { @@ -361,7 +365,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list)) { antexListResult.convertToResult(null, list.get(0), null); for (Patients patients : list) { - HighScoreResult highScoreResult = findLastRisk(patients.getId(), false); + HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); antexListResult.setRiskScore(highScoreResult.getScore() + ""); @@ -606,7 +610,7 @@ public class AntenatalExaminationFacade { //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); - HighScoreResult highScoreResult = findLastRisk(patients.getId(), false); + HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setParentId(patients.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 9d9031a..89124c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -374,7 +374,7 @@ public class ApplyOrderFacade { applyOrderResult.setApplyDoctor(users.getName()); } } - HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(orderModel.getParentId(), true); + HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(orderModel.getPid(), true); applyOrderResult.setrRisk(highScoreResult.gethighRiskStr()); applyOrderResult.setScore(highScoreResult.getScore()); applyOrderResult.setrLevel(highScoreResult.getLevelStr()); 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 7def74c..8bbad09 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 @@ -414,7 +414,7 @@ public class MatDeliverFacade { antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); List examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(), false); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); try { String tTireNumber = ""; 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 e90d4c9..615d796 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 @@ -246,7 +246,7 @@ public class PatientFacade { patientBaseResult.convert(patients); } try { - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(),false); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(),false); patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); patientBaseResult.setRiskScore(highScoreResult.getScore() + ""); } catch (Exception e) { @@ -392,7 +392,7 @@ public class PatientFacade { nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()); } } - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(), true); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); quanPatientsResult.setcTime(nextCheckTime); quanPatientsResult.setrLevel(highScoreResult.getLevelStr()); data.add(quanPatientsResult); @@ -440,7 +440,7 @@ public class PatientFacade { } antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(),true); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(),true); //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); antExChuQuery.setParentId(patients.getId()); 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 d1ad4f0..5dcfb16 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 @@ -142,7 +142,7 @@ public class PostReviewFacade { dueDate= list.get(0).getDueDate(); } - HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getId(),false); + HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getPid(),false); List dataList = new ArrayList<>(); if(CollectionUtils.isNotEmpty(postReviewModels)){ -- 1.8.3.1