From a76abdca201f237fc17ac9fd1544926a78a72b41 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 1 Aug 2018 11:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=8C=BB=E5=AD=A6=E8=AF=81?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 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 208f463..5c8a345 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 @@ -2718,7 +2718,10 @@ public class AntenatalExaminationFacade { antexListResult.setIsSendTui(1); } AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setPid(patients.getPid()); + + //http://jira.healthbaby.com.cn/browse/WEB-2733 + //antExChuQuery.setPid(patients.getPid()); + antExChuQuery.setParentId(patients.getId()); antExChuQuery.setYn(YnEnums.YES.getId()); Date max = null; if (!sortList.isEmpty()) { @@ -2735,7 +2738,12 @@ public class AntenatalExaminationFacade { HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setPid(patients.getPid()); + + //http://jira.healthbaby.com.cn/browse/WEB-2733 + //antExQuery.setPid(patients.getPid()); + antExQuery.setParentId(patients.getId()); + + antExQuery.setStart(max); //查询复诊记录 List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); @@ -2749,7 +2757,11 @@ public class AntenatalExaminationFacade { //获取最后一次检查的记录 AntExQuery antExQuery1 = new AntExQuery(); antExQuery1.setHospitalId(hospitalId); - antExQuery1.setPid(patients.getPid()); + + //http://jira.healthbaby.com.cn/browse/WEB-2733 + //antExQuery1.setPid(patients.getPid()); + antExQuery1.setParentId(patients.getId()); + antExQuery1.setYn(YnEnums.YES.getId()); antExQuery1.setStart(max); // System.out.println("复诊查询："+antExQuery1.convertToQuery().convertToMongoQuery()); -- 1.8.3.1