From a57923a1fd0ed7913ef3e971e3bfd3d378b8c8fe Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 10 Apr 2018 17:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=87=AA=E5=8A=A8=E5=88=86?= =?UTF-8?q?=E5=A8=A9=E7=9A=84=E5=AD=95=E5=A6=87=E5=86=8D=E6=AC=A1=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3=E5=90=8E=EF=BC=8C=E7=94=B5=E5=AD=90=E7=97=85=E5=8E=86?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=E5=8F=8A=E4=BA=A7=E6=A3=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 3227fca..08ed1d4 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 @@ -2128,11 +2128,18 @@ public class AntenatalExaminationFacade { stopPregQuery.setPid(patients.getPid()); stopPregQuery.setYn(YnEnums.YES.getId()); + + //查询终止妊娠 List list2 = stopPregnancyService.queryStopPreg(stopPregQuery); - + //已经分娩的产程 + Patients fmPatient = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); List sortList = new ArrayList<>(); + if(fmPatient!=null){ + fmPatient.setBookbuildingDate(fmPatient.getFmDate()); + sortList.add(new SortIn(fmPatient)); + } if (CollectionUtils.isNotEmpty(list1)) { for (MaternalDeliverModel model : list1) { sortList.add(new SortIn(model)); -- 1.8.3.1