jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f0b5486ae564f8ffcf61922efa9a10a191d4b40b

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

分娩加入手工分娩孕周

Showing 4 changed files with 36 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ f0b5486
... ... @@ -24,6 +24,8 @@
24 24 /**新加字段***/
25 25 //产次
26 26 private Integer dueCount;
  27 + //手工分娩孕周
  28 + private Map<String,Object> handDueWeek;
27 29 //产妇id
28 30 private String parentId;
29 31 private String pid;
... ... @@ -156,6 +158,14 @@
156 158 * 是否结案 1-未结案、2-已结案
157 159 */
158 160 private Integer isClose;
  161 +
  162 + public Map<String, Object> getHandDueWeek() {
  163 + return handDueWeek;
  164 + }
  165 +
  166 + public void setHandDueWeek(Map<String, Object> handDueWeek) {
  167 + this.handDueWeek = handDueWeek;
  168 + }
159 169  
160 170 public Integer getDueCount() {
161 171 return dueCount;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ f0b5486
... ... @@ -21,6 +21,8 @@
21 21 /**新加字段***/
22 22 //产次
23 23 private Integer dueCount;
  24 + //手工分娩孕周
  25 + private Map handDueWeek;
24 26 //
25 27 private String pid;
26 28 //产妇id
... ... @@ -96,6 +98,14 @@
96 98  
97 99 private YunBookbuildingAddRequest patient;
98 100  
  101 + public Map getHandDueWeek() {
  102 + return handDueWeek;
  103 + }
  104 +
  105 + public void setHandDueWeek(Map handDueWeek) {
  106 + this.handDueWeek = handDueWeek;
  107 + }
  108 +
99 109 public YunBookbuildingAddRequest getPatient() {
100 110 return patient;
101 111 }
... ... @@ -203,6 +213,7 @@
203 213 @Override
204 214 public MaternalDeliverModel convertToDataModel() {
205 215 MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
  216 + maternalDeliverModel.setHandDueWeek(handDueWeek);
206 217 maternalDeliverModel.setDueCount(dueCount);
207 218 maternalDeliverModel.setFmType(fmType);
208 219 maternalDeliverModel.setFmAddr(fmAddr);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java View file @ f0b5486
... ... @@ -7,6 +7,7 @@
7 7 import java.util.ArrayList;
8 8 import java.util.Date;
9 9 import java.util.List;
  10 +import java.util.Map;
10 11  
11 12 /**
12 13 * 分娩信息记录表
... ... @@ -28,6 +29,9 @@
28 29 private String phone;
29 30 //高危因素
30 31 private List riskFactor;
  32 +
  33 + //手工分娩孕周
  34 + private Map handDueWeek;
31 35  
32 36 public List getRiskFactor() {
33 37 return riskFactor;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java View file @ f0b5486
... ... @@ -20,6 +20,8 @@
20 20 private String parentId;
21 21 //分娩时间
22 22 private String dueDate;
  23 + //手工分娩孕周
  24 + private Map<String,Object> handDueWeek;
23 25 //分娩孕周
24 26 private String dueWeek;
25 27 // 产次
26 28  
... ... @@ -94,12 +96,21 @@
94 96 this.dueCount = dueCount;
95 97 }
96 98  
  99 + public Map<String, Object> getHandDueWeek() {
  100 + return handDueWeek;
  101 + }
  102 +
  103 + public void setHandDueWeek(Map<String, Object> handDueWeek) {
  104 + this.handDueWeek = handDueWeek;
  105 + }
  106 +
97 107 public void setDeathCauseText(String deathCauseText) {
98 108 this.deathCauseText = deathCauseText;
99 109 }
100 110  
101 111 public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
102 112 setDueCount(destModel.getDueCount());
  113 + setHandDueWeek(destModel.getHandDueWeek());
103 114 setFmAddr(destModel.getFmAddr());
104 115 setFmType(destModel.getFmType());
105 116 setId(destModel.getId());