jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 79eba6a1e3dcd7cf2269778c9bc92d09630adbf0

Authored by jiangjiazhi
1 parent b30fd81968
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

增加

Showing 1 changed file with 66 additions and 63 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 79eba6a
... ... @@ -3,10 +3,12 @@
3 3 import com.lyms.platform.common.base.IBasicRequestConvert;
4 4 import com.lyms.platform.common.core.annotation.form.FormParam;
5 5 import com.lyms.platform.common.core.annotation.form.Form;
  6 +import com.lyms.platform.common.utils.JsonUtil;
6 7 import com.lyms.platform.pojo.AntExChuModel;
7 8 import org.hibernate.validator.constraints.NotEmpty;
8 9  
9 10 import java.util.List;
  11 +import java.util.Map;
10 12  
11 13 /**
12 14 *
13 15  
14 16  
15 17  
16 18  
17 19  
18 20  
... ... @@ -22,19 +24,19 @@
22 24 private String id;
23 25  
24 26 // 既往史
25   - private String pastHistory ;
  27 + private Map pastHistory ;
26 28 // 家族史
27   - private String familyHistory ;
  29 + private Map familyHistory ;
28 30 //个人史
29   - private String personalHistory;
  31 + private Map personalHistory;
30 32 //疫苗接种史
31   - private String ymjzHistory ;
  33 + private Map ymjzHistory ;
32 34 //药物过敏史
33   - private String ywgmHistory ;
  35 + private Map ywgmHistory ;
34 36 //妇科手术史
35   - private String fksxHistory ;
  37 + private Map fksxHistory ;
36 38 // 叶酸服用
37   - private String ysfyHistory ;
  39 + private Map ysfyHistory ;
38 40 //孕次
39 41 private String pregnancyTimes;
40 42 // 产次
... ... @@ -62,7 +64,7 @@
62 64 //体重指数
63 65 private String baricIndex;
64 66 //本次妊娠情况
65   - private String cestationInfo;
  67 + private Map cestationInfo;
66 68 // 宫高
67 69 private String gonggao;
68 70 //腹围
... ... @@ -84,7 +86,7 @@
84 86 //高危评分
85 87 private String highriskSocre;
86 88 // 其他高危
87   - private String otherHighRisk;
  89 + private Map otherHighRisk;
88 90 // 诊断
89 91 private String diagnosis;
90 92 //处理意见
... ... @@ -96,7 +98,7 @@
96 98 //产检日期
97 99 private String checkTime;
98 100 //下次产检时间
99   - private String nextCheckTime;
  101 + private Map nextCheckTime;
100 102 public String getParentId() {
101 103 return parentId;
102 104 }
103 105  
... ... @@ -137,11 +139,11 @@
137 139 this.birthDefect = birthDefect;
138 140 }
139 141  
140   - public String getCestationInfo() {
  142 + public Map getCestationInfo() {
141 143 return cestationInfo;
142 144 }
143 145  
144   - public void setCestationInfo(String cestationInfo) {
  146 + public void setCestationInfo(Map cestationInfo) {
145 147 this.cestationInfo = cestationInfo;
146 148 }
147 149  
148 150  
... ... @@ -177,22 +179,7 @@
177 179 this.dirOpinion = dirOpinion;
178 180 }
179 181  
180   - public String getFamilyHistory() {
181   - return familyHistory;
182   - }
183 182  
184   - public void setFamilyHistory(String familyHistory) {
185   - this.familyHistory = familyHistory;
186   - }
187   -
188   - public String getFksxHistory() {
189   - return fksxHistory;
190   - }
191   -
192   - public void setFksxHistory(String fksxHistory) {
193   - this.fksxHistory = fksxHistory;
194   - }
195   -
196 183 public String getFuwei() {
197 184 return fuwei;
198 185 }
199 186  
200 187  
201 188  
202 189  
... ... @@ -241,38 +228,22 @@
241 228 this.neoDeath = neoDeath;
242 229 }
243 230  
244   - public String getNextCheckTime() {
  231 + public Map getNextCheckTime() {
245 232 return nextCheckTime;
246 233 }
247 234  
248   - public void setNextCheckTime(String nextCheckTime) {
  235 + public void setNextCheckTime(Map nextCheckTime) {
249 236 this.nextCheckTime = nextCheckTime;
250 237 }
251 238  
252   - public String getOtherHighRisk() {
  239 + public Map getOtherHighRisk() {
253 240 return otherHighRisk;
254 241 }
255 242  
256   - public void setOtherHighRisk(String otherHighRisk) {
  243 + public void setOtherHighRisk(Map otherHighRisk) {
257 244 this.otherHighRisk = otherHighRisk;
258 245 }
259 246  
260   - public String getPastHistory() {
261   - return pastHistory;
262   - }
263   -
264   - public void setPastHistory(String pastHistory) {
265   - this.pastHistory = pastHistory;
266   - }
267   -
268   - public String getPersonalHistory() {
269   - return personalHistory;
270   - }
271   -
272   - public void setPersonalHistory(String personalHistory) {
273   - this.personalHistory = personalHistory;
274   - }
275   -
276 247 public List<MatDeliverAddRequest.Placenta> getPlacentas() {
277 248 return placentas;
278 249 }
279 250  
... ... @@ -353,11 +324,43 @@
353 324 this.weight = weight;
354 325 }
355 326  
356   - public String getYmjzHistory() {
  327 + public Map getFamilyHistory() {
  328 + return familyHistory;
  329 + }
  330 +
  331 + public void setFamilyHistory(Map familyHistory) {
  332 + this.familyHistory = familyHistory;
  333 + }
  334 +
  335 + public Map getFksxHistory() {
  336 + return fksxHistory;
  337 + }
  338 +
  339 + public void setFksxHistory(Map fksxHistory) {
  340 + this.fksxHistory = fksxHistory;
  341 + }
  342 +
  343 + public Map getPastHistory() {
  344 + return pastHistory;
  345 + }
  346 +
  347 + public void setPastHistory(Map pastHistory) {
  348 + this.pastHistory = pastHistory;
  349 + }
  350 +
  351 + public Map getPersonalHistory() {
  352 + return personalHistory;
  353 + }
  354 +
  355 + public void setPersonalHistory(Map personalHistory) {
  356 + this.personalHistory = personalHistory;
  357 + }
  358 +
  359 + public Map getYmjzHistory() {
357 360 return ymjzHistory;
358 361 }
359 362  
360   - public void setYmjzHistory(String ymjzHistory) {
  363 + public void setYmjzHistory(Map ymjzHistory) {
361 364 this.ymjzHistory = ymjzHistory;
362 365 }
363 366  
364 367  
365 368  
366 369  
... ... @@ -369,19 +372,19 @@
369 372 this.yqWeight = yqWeight;
370 373 }
371 374  
372   - public String getYsfyHistory() {
  375 + public Map getYsfyHistory() {
373 376 return ysfyHistory;
374 377 }
375 378  
376   - public void setYsfyHistory(String ysfyHistory) {
  379 + public void setYsfyHistory(Map ysfyHistory) {
377 380 this.ysfyHistory = ysfyHistory;
378 381 }
379 382  
380   - public String getYwgmHistory() {
  383 + public Map getYwgmHistory() {
381 384 return ywgmHistory;
382 385 }
383 386  
384   - public void setYwgmHistory(String ywgmHistory) {
  387 + public void setYwgmHistory(Map ywgmHistory) {
385 388 this.ywgmHistory = ywgmHistory;
386 389 }
387 390  
... ... @@ -390,13 +393,13 @@
390 393 AntExChuModel antExChuModel=new AntExChuModel();
391 394 antExChuModel.setId(id);
392 395 antExChuModel.setParentId(parentId);
393   - antExChuModel.setPastHistory(pastHistory);
394   - antExChuModel.setFamilyHistory(familyHistory);
395   - antExChuModel.setPersonalHistory(personalHistory);
396   - antExChuModel.setYmjzHistory(ymjzHistory);
397   - antExChuModel.setYwgmHistory(ywgmHistory);
398   - antExChuModel.setFksxHistory(fksxHistory);
399   - antExChuModel.setYsfyHistory(ysfyHistory);
  396 + antExChuModel.setPastHistory(JsonUtil.obj2JsonString(pastHistory));
  397 + antExChuModel.setFamilyHistory(JsonUtil.obj2JsonString(familyHistory));
  398 + antExChuModel.setPersonalHistory(JsonUtil.obj2JsonString(personalHistory));
  399 + antExChuModel.setYmjzHistory(JsonUtil.obj2JsonString(ymjzHistory));
  400 + antExChuModel.setYwgmHistory(JsonUtil.obj2JsonString(ywgmHistory));
  401 + antExChuModel.setFksxHistory(JsonUtil.obj2JsonString(fksxHistory));
  402 + antExChuModel.setYsfyHistory(JsonUtil.obj2JsonString(ysfyHistory));
400 403 antExChuModel.setPregnancyTimes(pregnancyTimes);
401 404 antExChuModel.setProdTime(prodTime);
402 405 antExChuModel.setDelivery(delivery);
403 406  
404 407  
... ... @@ -410,20 +413,20 @@
410 413 antExChuModel.setWeight(weight);
411 414 antExChuModel.setYqWeight(yqWeight);
412 415 antExChuModel.setBaricIndex(baricIndex);
413   - antExChuModel.setCestationInfo(cestationInfo);
  416 + antExChuModel.setCestationInfo(JsonUtil.obj2JsonString(cestationInfo));
414 417 antExChuModel.setGonggao(gonggao);
415 418 antExChuModel.setFuwei(fuwei);
416 419 antExChuModel.setTireNumber1(tireNumber1);
417 420 antExChuModel.setPlacentas(placentas);
418 421 antExChuModel.setHighrisk(highrisk);
419 422 antExChuModel.setHighriskSocre(highriskSocre);
420   - antExChuModel.setOtherHighRisk(otherHighRisk);
  423 + antExChuModel.setOtherHighRisk(JsonUtil.obj2JsonString(otherHighRisk));
421 424 antExChuModel.setDiagnosis(diagnosis);
422 425 antExChuModel.setTreatOpinion(treatOpinion);
423 426 antExChuModel.setDirOpinion(dirOpinion);
424 427 antExChuModel.setProdDoctor(prodDoctor);
425 428 antExChuModel.setCheckTime(checkTime);
426   - antExChuModel.setNextCheckTime(nextCheckTime);
  429 + antExChuModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
427 430 return antExChuModel;
428 431 }
429 432