jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 02596987ca4cd5fe30bfd269b6640b8d036b8a68

Authored by dongqin
2 parents ecc0c65933 42e4393dfd
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 0259698
... ... @@ -2613,6 +2613,16 @@
2613 2613  
2614 2614  
2615 2615 newBabyManagerQueryModel.setFmWeek(maternalDeliverModel.getDueWeek());
  2616 +
  2617 + String handDueWeek = "";
  2618 + Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
  2619 + if (handDueWeekMap != null && handDueWeekMap.size() > 0)
  2620 + {
  2621 + handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" );
  2622 + }
  2623 + newBabyManagerQueryModel.setHandDueWeek(handDueWeek);
  2624 +
  2625 +
2616 2626 for (SexEnum sexEnum : SexEnum.values()) {
2617 2627 if (sexEnum.getId().equals(babyModel.getSex())) {
2618 2628 newBabyManagerQueryModel.setSex(sexEnum.getText());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 0259698
... ... @@ -2956,7 +2956,16 @@
2956 2956  
2957 2957 map.put("deliveryDate", data.getDueDate());
2958 2958 map.put("dueWeek", data.getDueWeek());
2959   - map.put("handDueWeek", data.getHandDueWeek());
  2959 +
  2960 +
  2961 + String handDueWeek = "";
  2962 + Map<String, Object> handDueWeekMap = data.getHandDueWeek();
  2963 + if (handDueWeekMap != null && handDueWeekMap.size() > 0)
  2964 + {
  2965 + handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" );
  2966 + }
  2967 +
  2968 + map.put("handDueWeek", handDueWeek);
2960 2969  
2961 2970 String fmHospital = "";
2962 2971 String addressPrefix = "";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 0259698
... ... @@ -498,6 +498,7 @@
498 498 normalQueryMap.put("age", "年龄");
499 499 normalQueryMap.put("cardNo", "证件号");
500 500 normalQueryMap.put("dueWeek", "分娩孕周");
  501 + normalQueryMap.put("handDueWeek", "手动分娩孕周");
501 502 normalQueryMap.put("deliveryMode", "分娩方式");
502 503 normalQueryMap.put("maternalInfo", "产妇情况");
503 504 normalQueryMap.put("tireNumber", "胎数");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ 0259698
... ... @@ -432,6 +432,19 @@
432 432  
433 433 private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
434 434  
  435 +
  436 +
  437 + //手动分娩孕周
  438 + private String handDueWeek;
  439 +
  440 + public String getHandDueWeek() {
  441 + return handDueWeek;
  442 + }
  443 +
  444 + public void setHandDueWeek(String handDueWeek) {
  445 + this.handDueWeek = handDueWeek;
  446 + }
  447 +
435 448 public String getBabyQX() {
436 449 return babyQX;
437 450 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java View file @ 0259698
... ... @@ -156,6 +156,16 @@
156 156 //手术原因
157 157 private String operationCause;
158 158  
  159 + //手动分娩孕周
  160 + private String handDueWeek;
  161 +
  162 + public String getHandDueWeek() {
  163 + return handDueWeek;
  164 + }
  165 +
  166 + public void setHandDueWeek(String handDueWeek) {
  167 + this.handDueWeek = handDueWeek;
  168 + }
159 169  
160 170 public String getNoEphone() {
161 171 return noEphone;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ 0259698
... ... @@ -83,6 +83,14 @@
83 83 int day = (patients.getFmWeek() % 7);
84 84 childbirthManagerQueryModel.setDueWeek("孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""));
85 85 }
  86 + String handDueWeek = "";
  87 + Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
  88 + if (handDueWeekMap != null && handDueWeekMap.size() > 0)
  89 + {
  90 + handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0")) ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" );
  91 + }
  92 + childbirthManagerQueryModel.setHandDueWeek(handDueWeek);
  93 +
86 94 // 分娩孕周
87 95  
88 96 // 分娩日期