From b38593c3591179709f54d2a98f31cfbbde4fb008 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 18 Jun 2020 16:29:51 +0800 Subject: [PATCH] update --- .../operate/web/facade/AntenatalExaminationFacade.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 7e60b8f..cbaca97 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 @@ -2322,11 +2322,11 @@ public class AntenatalExaminationFacade { //出院小结 DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId()); -// if (patients2 != null) { -// dischargeAbstractMotherQuery.setPatientId(patients2.getId()); -// } else { -// dischargeAbstractMotherQuery.setPatientId(patientId); -// } + if (patients2 != null) { + dischargeAbstractMotherQuery.setPatientId(patients2.getId()); + } else { + dischargeAbstractMotherQuery.setPatientId(patientId); + } //解决转诊后 再分娩再出院小结 电子病历中没有出院小结 dischargeAbstractMotherQuery.setPid(patients.getPid()); @@ -2334,10 +2334,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(dischargeAbstractMotherModels)) { for (DischargeAbstractMotherModel model : dischargeAbstractMotherModels) { - if (model.getPatientId().equals(patientId) || model.getPatientId().equals(patients.getSource()) || model.getPatientId().equals(patients2.getSource())) - { - listData.add(new AntData(model, null != organization ? organization.getName() : "", patients.getFmDate())); - } + listData.add(new AntData(model, null != organization ? organization.getName() : "", patients.getFmDate())); } } -- 1.8.3.1