From 4f75ca970102d05d8c23ed85a267af9c729ae697 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 7 Dec 2022 17:12:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=8A=B1=E5=90=8D=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/MatDeliverController.java | 2 ++ .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 8 ++++++++ .../platform/operate/web/result/NewBabyManagerQueryModel.java | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 5cc9b3d..d2697ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -529,6 +529,7 @@ public class MatDeliverController extends BaseController { map.put("yc", newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity()); map.put("cc", newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount()); + map.put("fmHospital", newBabyManagerQueryModel.getFmHospital() == null ? "" : newBabyManagerQueryModel.getFmHospital()); // AntExChuQuery antExChuQuery = new AntExChuQuery(); // antExChuQuery.setYn(YnEnums.YES.getId()); @@ -563,6 +564,7 @@ public class MatDeliverController extends BaseController { header.put("babyHeight", "身长cm"); header.put("babyWeight", "体重g"); header.put("fmDate", "出生时间(具体到分)"); + header.put("fmHospital", "分娩医院"); header.put("liveAddress", "产妇户籍地"); header.put("addressRegister", "居住地"); 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 542b775..f8920db 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 @@ -3103,6 +3103,14 @@ public class MatDeliverFacade { } catch (Exception e) { deliverDoctor = maternalDeliverModel.getDeliverDoctor(); } + + String fmHospital = ""; + try { + fmHospital = organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getHospitalId())).getName(); + } catch (Exception e) { + fmHospital = maternalDeliverModel.getHospitalId(); + } + newBabyManagerQueryModel.setFmHospital(fmHospital); newBabyManagerQueryModel.setDeliverDoctor(deliverDoctor); newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java index 3df21dd..320fbf7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java @@ -163,7 +163,15 @@ public class NewBabyManagerQueryModel { private String fname; //居住地址 private String address; + private String fmHospital; + public String getFmHospital() { + return fmHospital; + } + + public void setFmHospital(String fmHospital) { + this.fmHospital = fmHospital; + } public String getAddress() { return address; -- 1.8.3.1