jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4f75ca970102d05d8c23ed85a267af9c729ae697

Authored by liquanyu
1 parent 23f6c66d19
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童花名册

Showing 3 changed files with 18 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 4f75ca9
... ... @@ -529,6 +529,7 @@
529 529  
530 530 map.put("yc", newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity());
531 531 map.put("cc", newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount());
  532 + map.put("fmHospital", newBabyManagerQueryModel.getFmHospital() == null ? "" : newBabyManagerQueryModel.getFmHospital());
532 533  
533 534 // AntExChuQuery antExChuQuery = new AntExChuQuery();
534 535 // antExChuQuery.setYn(YnEnums.YES.getId());
... ... @@ -563,6 +564,7 @@
563 564 header.put("babyHeight", "身长cm");
564 565 header.put("babyWeight", "体重g");
565 566 header.put("fmDate", "出生时间(具体到分)");
  567 + header.put("fmHospital", "分娩医院");
566 568  
567 569 header.put("liveAddress", "产妇户籍地");
568 570 header.put("addressRegister", "居住地");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 4f75ca9
... ... @@ -3103,6 +3103,14 @@
3103 3103 } catch (Exception e) {
3104 3104 deliverDoctor = maternalDeliverModel.getDeliverDoctor();
3105 3105 }
  3106 +
  3107 + String fmHospital = "";
  3108 + try {
  3109 + fmHospital = organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getHospitalId())).getName();
  3110 + } catch (Exception e) {
  3111 + fmHospital = maternalDeliverModel.getHospitalId();
  3112 + }
  3113 + newBabyManagerQueryModel.setFmHospital(fmHospital);
3106 3114 newBabyManagerQueryModel.setDeliverDoctor(deliverDoctor);
3107 3115 newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
3108 3116 newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java View file @ 4f75ca9
... ... @@ -163,7 +163,15 @@
163 163 private String fname;
164 164 //居住地址
165 165 private String address;
  166 + private String fmHospital;
166 167  
  168 + public String getFmHospital() {
  169 + return fmHospital;
  170 + }
  171 +
  172 + public void setFmHospital(String fmHospital) {
  173 + this.fmHospital = fmHospital;
  174 + }
167 175  
168 176 public String getAddress() {
169 177 return address;