From 8852b8073051087989da2f5ca278356d33813c17 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Sep 2016 10:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/StopPregQuery.java | 2 +- .../web/facade/AntenatalExaminationFacade.java | 65 +++++++++++++--------- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java index 7ba6aa2..b22eb31 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java @@ -32,7 +32,7 @@ public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery { //录入人 private String inPerson; - private Integer yn; + private Integer yn=-1; private String pid; @Override 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 56cea67..a33a4d1 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 @@ -556,6 +556,7 @@ public class AntenatalExaminationFacade { Date dueDate = new Date(); if (CollectionUtils.isNotEmpty(listDate)) { String pid = ""; + int count = 0; for (int i = 0; i < listDate.size(); i++) { dueDate = listDate.get(i).getDate(); Date end = new Date(listDate.get(i).getDate().getTime() + 86398000); @@ -571,6 +572,7 @@ public class AntenatalExaminationFacade { patientsQuery1.setPid(pid); List patientses = patientsService.queryPatient1(patientsQuery1); if (CollectionUtils.isNotEmpty(patientses)) { + count=count+patientses.size(); Iterator iterator = patientses.iterator(); while (iterator.hasNext()) { Patients patients = iterator.next(); @@ -634,9 +636,15 @@ public class AntenatalExaminationFacade { postReviewQuery.setPid(pid); Object obj = map.get(listDate.get(i).getId()); if (obj instanceof MaternalDeliverModel) { - listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + MaternalDeliverModel model = (MaternalDeliverModel) obj; + if(model.getYn() == YnEnums.YES.getId()){ + listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + } } else if (obj instanceof StopPregModel) { - listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + StopPregModel model=(StopPregModel)obj; + if(model.getYn() == YnEnums.YES.getId()) { + listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + } } //产后复查记录 @@ -656,29 +664,34 @@ public class AntenatalExaminationFacade { Collections.reverse(sortList); } } - PatientsQuery patientsQuery1 = new PatientsQuery(); - patientsQuery1.setYn(YnEnums.YES.getId()); - patientsQuery1.setPid(pid); - patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(0).getDate().getTime())); - patientsQuery1.setType(1); - patientsQuery1.setBuildType(1); - List patientsList = patientsService.queryPatient(patientsQuery1); - List list1 = new ArrayList(); - List tmp = new ArrayList(); - for (Patients patients : patientsList) { - tmp.add(new SortIn(patients)); - } - sortList(tmp); - Date min = null; - if (!tmp.isEmpty()) { - min = tmp.get(tmp.size() - 1).getDate(); - } - List l = buildPatientList(new Date(), patientsList, list1, min, false); - if (!l.isEmpty()) { - sort(l); - sortList.add(l); + if(list.size()>count){ + //分娩记录剩下的建档 + PatientsQuery patientsQuery1 = new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setPid(pid); + patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(0).getDate().getTime())); + patientsQuery1.setType(1); + patientsQuery1.setBuildType(1); + List patientsList = patientsService.queryPatient(patientsQuery1); + List list1 = new ArrayList(); + List tmp = new ArrayList(); + for (Patients patients : patientsList) { + tmp.add(new SortIn(patients)); + } + sortList(tmp); + Date min = null; + if (!tmp.isEmpty()) { + min = tmp.get(tmp.size() - 1).getDate(); + } + List l = buildPatientList(new Date(), patientsList, list1, min, false); + if (!l.isEmpty()) { + sort(l); + sortList.add(l); + } } + } else { + //没有终止的情况 List list1 = new ArrayList(); List tmp = new ArrayList(); for (Patients patients : list) { @@ -1006,12 +1019,14 @@ public class AntenatalExaminationFacade { antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalId(hospital); List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - + //TODO 需要根据时间去查询是否是本院最后一条记录 if(CollectionUtils.isNotEmpty(list)){ antExQuery.setStart(new Date(list.get(0).getCheckDate().getTime()+40000)); } antExQuery.setId(null); - list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + + if(CollectionUtils.isEmpty(list)){ antenatalExaminationService.updateOneAnt(antEx, antExQueryRequest.getId()); }else{ -- 1.8.3.1