shiyang / regional-platform

Download as
Browse Code »

Commit 48a60515ef9bbcbe3b7ae70dcac76f44185a3e17

Authored by jiangjiazhi
1 parent 375771a8af
Exists in master and in 1 other branch nobuildprocess

修改访视bug

Showing 6 changed files with 266 additions and 241 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java View file @ 48a6051
... ... @@ -33,7 +33,12 @@
33 33 }
34 34  
35 35 public static String obj2JsonString(Object obj) {
36   - return JSONObject.fromObject(obj).toString();
  36 + try {
  37 + return JSONObject.fromObject(obj).toString();
  38 + }catch (Exception e){
  39 + ExceptionUtils.catchException(e,"obj2 json string error ."+e.getMessage());
  40 + }
  41 + return null;
37 42 }
38 43  
39 44 public static String array2JsonString(Object obj) {
platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java View file @ 48a6051
... ... @@ -83,13 +83,13 @@
83 83 private String neonatalAsphyxia;
84 84  
85 85 // 是否畸形
86   - private int deformity;
  86 + private String deformity;
87 87  
88 88 // 听力情况
89 89 private int hearing;
90 90  
91 91 // 疾病筛查
92   - private int disease;
  92 + private String disease;
93 93  
94 94 // 出生体重
95 95 private double birthWeight;
96 96  
... ... @@ -332,11 +332,11 @@
332 332 this.neonatalAsphyxia = neonatalAsphyxia;
333 333 }
334 334  
335   - public int getDeformity() {
  335 + public String getDeformity() {
336 336 return deformity;
337 337 }
338 338  
339   - public void setDeformity(int deformity) {
  339 + public void setDeformity(String deformity) {
340 340 this.deformity = deformity;
341 341 }
342 342  
343 343  
... ... @@ -348,11 +348,11 @@
348 348 this.hearing = hearing;
349 349 }
350 350  
351   - public int getDisease() {
  351 + public String getDisease() {
352 352 return disease;
353 353 }
354 354  
355   - public void setDisease(int disease) {
  355 + public void setDisease(String disease) {
356 356 this.disease = disease;
357 357 }
358 358  
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 48a6051
... ... @@ -32,9 +32,9 @@
32 32 * 地址
33 33 */
34 34 private String address;
35   - private int provinceId;
36   - private int cityId;
37   - private int areaId;
  35 + private Integer provinceId;
  36 + private Integer cityId;
  37 + private Integer areaId;
38 38  
39 39 public int getAreaId() {
40 40 return areaId;
... ... @@ -67,7 +67,7 @@
67 67 /**
68 68 * 是否访视
69 69 */
70   - private int isVisit;
  70 + private Integer isVisit;
71 71  
72 72 private String id;
73 73  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java View file @ 48a6051
... ... @@ -75,7 +75,7 @@
75 75 @ResponseBody
76 76 @TokenRequired
77 77 @RequestMapping(value = "/visitbaby", method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE,consumes =MediaType.APPLICATION_JSON_VALUE )
78   - public BaseResponse addOneBabyVisit(@Valid
  78 + public BaseResponse addOneBabyVisit(@Valid @RequestBody
79 79 BabyVisitAddRequest babyVisitAddRequest) {
80 80 return visitFacade.addOrUpdateBabyAndVisit(babyVisitAddRequest);
81 81 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java View file @ 48a6051
... ... @@ -3,10 +3,13 @@
3 3 import com.lyms.platform.common.base.IBasicRequestConvert;
4 4 import com.lyms.platform.common.core.annotation.form.Form;
5 5 import com.lyms.platform.common.utils.DateUtil;
  6 +import com.lyms.platform.common.utils.JsonUtil;
6 7 import com.lyms.platform.pojo.BabyVisitModel;
7 8 import com.lyms.platform.pojo.Patients;
8 9  
9 10 import java.util.Date;
  11 +import java.util.List;
  12 +import java.util.Map;
10 13  
11 14 @Form
12 15 public class BabyVisitAddRequest implements IBasicRequestConvert<BabyVisitModel> {
13 16  
14 17  
15 18  
... ... @@ -22,34 +25,16 @@
22 25 private int cityId;
23 26 private int areaId;
24 27  
25   - public void setAddress(String address) {
26   - this.address = address;
27   - }
  28 + private String phone;
28 29  
29   - public int getAreaId() {
30   - return areaId;
  30 + public String getPhone() {
  31 + return phone;
31 32 }
32 33  
33   - public void setAreaId(int areaId) {
34   - this.areaId = areaId;
  34 + public void setPhone(String phone) {
  35 + this.phone = phone;
35 36 }
36 37  
37   - public int getCityId() {
38   - return cityId;
39   - }
40   -
41   - public void setCityId(int cityId) {
42   - this.cityId = cityId;
43   - }
44   -
45   - public int getProvinceId() {
46   - return provinceId;
47   - }
48   -
49   - public void setProvinceId(int provinceId) {
50   - this.provinceId = provinceId;
51   - }
52   -
53 38 // 名称
54 39 private String name;
55 40  
56 41  
57 42  
58 43  
59 44  
... ... @@ -83,25 +68,25 @@
83 68 private int week;
84 69  
85 70 // 母亲患病情况
86   - private String sickenInfo;
  71 + private Map sickenInfo;
87 72  
88 73 // 助产结构名称
89 74 private String org;
90 75  
91 76 // 出生情况
92   - private String birthSituation;
  77 + private Map birthSituation;
93 78  
94 79 // 新生儿窒息
95   - private String neonatalAsphyxia;
  80 + private int neonatalAsphyxia;
96 81  
97 82 // 是否畸形
98   - private int deformity;
  83 + private Map deformity;
99 84  
100 85 // 听力情况
101 86 private int hearing;
102 87  
103 88 // 疾病筛查
104   - private int disease;
  89 + private Map disease;
105 90  
106 91 // 出生体重
107 92 private double birthWeight;
108 93  
109 94  
110 95  
111 96  
112 97  
113 98  
114 99  
115 100  
116 101  
117 102  
118 103  
119 104  
120 105  
121 106  
122 107  
123 108  
124 109  
125 110  
... ... @@ -140,61 +125,61 @@
140 125 private double respiratoryRate;
141 126  
142 127 // 面色
143   - private String complexion;
  128 + private Map complexion;
144 129  
145 130 // 黄疸部位
146   - private String jaundiceParts;
  131 + private Map jaundiceParts;
147 132  
148 133 // 前卤
149   - private String bregma;
  134 + private Map bregma;
150 135  
151 136 // 眼睛
152   - private String eye;
  137 + private Map eye;
153 138  
154 139 // 四肢活动度
155   - private String limbsActivity;
  140 + private Map limbsActivity;
156 141  
157 142 // 耳外观
158   - private String earAppearance;
  143 + private Map earAppearance;
159 144  
160 145 // 颈部包块
161   - private String cervicalMass;
  146 + private Map cervicalMass;
162 147  
163 148 // 鼻
164   - private String nose;
  149 + private Map nose;
165 150  
166 151 // 皮肤
167   - private String skin;
  152 + private Map skin;
168 153  
169 154 // 口腔
170   - private String mouthCavity;
  155 + private Map mouthCavity;
171 156  
172 157 // 肛门
173   - private String anus;
  158 + private Map anus;
174 159  
175 160 // 心肺听诊
176   - private String auscultation;
  161 + private Map auscultation;
177 162  
178 163 // 胸部
179   - private String breast;
  164 + private Map breast;
180 165  
181 166 // 腹部触诊
182   - private String abdominalPalpation;
  167 + private Map abdominalPalpation;
183 168  
184 169 // 脊柱
185   - private String backbone;
  170 + private Map backbone;
186 171  
187 172 // 外生殖器
188   - private String pudendum;
  173 + private Map pudendum;
189 174  
190 175 // 脐带
191   - private String funicle;
  176 + private Map funicle;
192 177  
193 178 // 转诊建议
194   - private String referralAdvice;
  179 + private Map referralAdvice;
195 180  
196 181 // 指导
197   - private String guide;
  182 + private List<String> guide;
198 183  
199 184 // 本次访视时间
200 185 private String currentVisit;
... ... @@ -211,6 +196,35 @@
211 196 // 访视记录id
212 197 private String id;
213 198  
  199 + public void setAddress(String address) {
  200 + this.address = address;
  201 + }
  202 +
  203 + public int getAreaId() {
  204 + return areaId;
  205 + }
  206 +
  207 + public void setAreaId(int areaId) {
  208 + this.areaId = areaId;
  209 + }
  210 +
  211 + public int getCityId() {
  212 + return cityId;
  213 + }
  214 +
  215 + public void setCityId(int cityId) {
  216 + this.cityId = cityId;
  217 + }
  218 +
  219 + public int getProvinceId() {
  220 + return provinceId;
  221 + }
  222 +
  223 + public void setProvinceId(int provinceId) {
  224 + this.provinceId = provinceId;
  225 + }
  226 +
  227 +
214 228 public String getId() {
215 229 return id;
216 230 }
217 231  
218 232  
219 233  
220 234  
221 235  
222 236  
223 237  
224 238  
225 239  
226 240  
227 241  
228 242  
229 243  
230 244  
231 245  
232 246  
233 247  
234 248  
235 249  
236 250  
237 251  
238 252  
239 253  
240 254  
241 255  
242 256  
243 257  
244 258  
245 259  
246 260  
247 261  
248 262  
249 263  
250 264  
251 265  
252 266  
253 267  
254 268  
255 269  
256 270  
257 271  
258 272  
259 273  
260 274  
261 275  
262 276  
263 277  
264 278  
265 279  
266 280  
267 281  
268 282  
269 283  
270 284  
271 285  
272 286  
273 287  
274 288  
275 289  
276 290  
277 291  
278 292  
279 293  
280 294  
281 295  
282 296  
283 297  
284 298  
285 299  
286 300  
287 301  
288 302  
289 303  
290 304  
291 305  
... ... @@ -331,307 +345,312 @@
331 345 this.week = week;
332 346 }
333 347  
334   - public String getSickenInfo() {
335   - return sickenInfo;
  348 + public Map getAbdominalPalpation() {
  349 + return abdominalPalpation;
336 350 }
337 351  
338   - public void setSickenInfo(String sickenInfo) {
339   - this.sickenInfo = sickenInfo;
  352 + public void setAbdominalPalpation(Map abdominalPalpation) {
  353 + this.abdominalPalpation = abdominalPalpation;
340 354 }
341 355  
342   - public String getOrg() {
343   - return org;
  356 + public String getAddress() {
  357 + return address;
344 358 }
345 359  
346   - public void setOrg(String org) {
347   - this.org = org;
  360 + public Map getAnus() {
  361 + return anus;
348 362 }
349 363  
350   - public String getBirthSituation() {
351   - return birthSituation;
  364 + public void setAnus(Map anus) {
  365 + this.anus = anus;
352 366 }
353 367  
354   - public void setBirthSituation(String birthSituation) {
355   - this.birthSituation = birthSituation;
  368 + public Map getAuscultation() {
  369 + return auscultation;
356 370 }
357 371  
358   - public String getNeonatalAsphyxia() {
359   - return neonatalAsphyxia;
  372 + public void setAuscultation(Map auscultation) {
  373 + this.auscultation = auscultation;
360 374 }
361 375  
362   - public void setNeonatalAsphyxia(String neonatalAsphyxia) {
363   - this.neonatalAsphyxia = neonatalAsphyxia;
  376 + public Map getBackbone() {
  377 + return backbone;
364 378 }
365 379  
366   - public int getDeformity() {
367   - return deformity;
  380 + public void setBackbone(Map backbone) {
  381 + this.backbone = backbone;
368 382 }
369 383  
370   - public void setDeformity(int deformity) {
371   - this.deformity = deformity;
  384 + public Map getBirthSituation() {
  385 + return birthSituation;
372 386 }
373 387  
374   - public int getHearing() {
375   - return hearing;
  388 + public void setBirthSituation(Map birthSituation) {
  389 + this.birthSituation = birthSituation;
376 390 }
377 391  
378   - public void setHearing(int hearing) {
379   - this.hearing = hearing;
  392 + public Map getBreast() {
  393 + return breast;
380 394 }
381 395  
382   - public int getDisease() {
383   - return disease;
  396 + public void setBreast(Map breast) {
  397 + this.breast = breast;
384 398 }
385 399  
386   - public void setDisease(int disease) {
387   - this.disease = disease;
  400 + public Map getBregma() {
  401 + return bregma;
388 402 }
389 403  
390   - public double getBirthWeight() {
391   - return birthWeight;
  404 + public void setBregma(Map bregma) {
  405 + this.bregma = bregma;
392 406 }
393 407  
394   - public void setBirthWeight(double birthWeight) {
395   - this.birthWeight = birthWeight;
  408 + public Map getCervicalMass() {
  409 + return cervicalMass;
396 410 }
397 411  
398   - public double getWeight() {
399   - return weight;
  412 + public void setCervicalMass(Map cervicalMass) {
  413 + this.cervicalMass = cervicalMass;
400 414 }
401 415  
402   - public void setWeight(double weight) {
403   - this.weight = weight;
  416 + public Map getComplexion() {
  417 + return complexion;
404 418 }
405 419  
406   - public double getHeight() {
407   - return height;
  420 + public void setComplexion(Map complexion) {
  421 + this.complexion = complexion;
408 422 }
409 423  
410   - public void setHeight(double height) {
411   - this.height = height;
  424 + public Map getDeformity() {
  425 + return deformity;
412 426 }
413 427  
414   - public int getFeedType() {
415   - return feedType;
  428 + public void setDeformity(Map deformity) {
  429 + this.deformity = deformity;
416 430 }
417 431  
418   - public void setFeedType(int feedType) {
419   - this.feedType = feedType;
  432 + public Map getDisease() {
  433 + return disease;
420 434 }
421 435  
422   - public int getEatMilk() {
423   - return eatMilk;
  436 + public void setDisease(Map disease) {
  437 + this.disease = disease;
424 438 }
425 439  
426   - public void setEatMilk(int eatMilk) {
427   - this.eatMilk = eatMilk;
  440 + public Map getEarAppearance() {
  441 + return earAppearance;
428 442 }
429 443  
430   - public int getEatTime() {
431   - return eatTime;
  444 + public void setEarAppearance(Map earAppearance) {
  445 + this.earAppearance = earAppearance;
432 446 }
433 447  
434   - public void setEatTime(int eatTime) {
435   - this.eatTime = eatTime;
  448 + public Map getEye() {
  449 + return eye;
436 450 }
437 451  
438   - public int getEmesis() {
439   - return emesis;
  452 + public void setEye(Map eye) {
  453 + this.eye = eye;
440 454 }
441 455  
442   - public void setEmesis(int emesis) {
443   - this.emesis = emesis;
  456 + public Map getFunicle() {
  457 + return funicle;
444 458 }
445 459  
446   - public String getShit() {
447   - return shit;
  460 + public void setFunicle(Map funicle) {
  461 + this.funicle = funicle;
448 462 }
449 463  
450   - public void setShit(String shit) {
451   - this.shit = shit;
  464 + public int getHearing() {
  465 + return hearing;
452 466 }
453 467  
454   - public int getShitTimes() {
455   - return shitTimes;
  468 + public void setHearing(int hearing) {
  469 + this.hearing = hearing;
456 470 }
457 471  
458   - public void setShitTimes(int shitTimes) {
459   - this.shitTimes = shitTimes;
  472 + public Map getJaundiceParts() {
  473 + return jaundiceParts;
460 474 }
461 475  
462   - public double getTemperature() {
463   - return temperature;
  476 + public void setJaundiceParts(Map jaundiceParts) {
  477 + this.jaundiceParts = jaundiceParts;
464 478 }
465 479  
466   - public void setTemperature(double temperature) {
467   - this.temperature = temperature;
  480 + public Map getLimbsActivity() {
  481 + return limbsActivity;
468 482 }
469 483  
470   - public double getHeartRate() {
471   - return heartRate;
  484 + public void setLimbsActivity(Map limbsActivity) {
  485 + this.limbsActivity = limbsActivity;
472 486 }
473 487  
474   - public void setHeartRate(double heartRate) {
475   - this.heartRate = heartRate;
  488 + public Map getMouthCavity() {
  489 + return mouthCavity;
476 490 }
477 491  
478   - public double getRespiratoryRate() {
479   - return respiratoryRate;
  492 + public void setMouthCavity(Map mouthCavity) {
  493 + this.mouthCavity = mouthCavity;
480 494 }
481 495  
482   - public void setRespiratoryRate(double respiratoryRate) {
483   - this.respiratoryRate = respiratoryRate;
  496 + public int getNeonatalAsphyxia() {
  497 + return neonatalAsphyxia;
484 498 }
485 499  
486   - public String getComplexion() {
487   - return complexion;
  500 + public void setNeonatalAsphyxia(int neonatalAsphyxia) {
  501 + this.neonatalAsphyxia = neonatalAsphyxia;
488 502 }
489 503  
490   - public void setComplexion(String complexion) {
491   - this.complexion = complexion;
  504 + public Map getNose() {
  505 + return nose;
492 506 }
493 507  
494   - public String getJaundiceParts() {
495   - return jaundiceParts;
  508 + public void setNose(Map nose) {
  509 + this.nose = nose;
496 510 }
497 511  
498   - public void setJaundiceParts(String jaundiceParts) {
499   - this.jaundiceParts = jaundiceParts;
  512 + public String getOrg() {
  513 + return org;
500 514 }
501 515  
502   - public String getBregma() {
503   - return bregma;
  516 + public void setOrg(String org) {
  517 + this.org = org;
504 518 }
505 519  
506   - public void setBregma(String bregma) {
507   - this.bregma = bregma;
  520 + public Map getPudendum() {
  521 + return pudendum;
508 522 }
509 523  
510   - public String getEye() {
511   - return eye;
  524 + public void setPudendum(Map pudendum) {
  525 + this.pudendum = pudendum;
512 526 }
513 527  
514   - public void setEye(String eye) {
515   - this.eye = eye;
  528 + public Map getReferralAdvice() {
  529 + return referralAdvice;
516 530 }
517 531  
518   - public String getLimbsActivity() {
519   - return limbsActivity;
  532 + public void setReferralAdvice(Map referralAdvice) {
  533 + this.referralAdvice = referralAdvice;
520 534 }
521 535  
522   - public void setLimbsActivity(String limbsActivity) {
523   - this.limbsActivity = limbsActivity;
  536 + public Map getSickenInfo() {
  537 + return sickenInfo;
524 538 }
525 539  
526   - public String getEarAppearance() {
527   - return earAppearance;
  540 + public void setSickenInfo(Map sickenInfo) {
  541 + this.sickenInfo = sickenInfo;
528 542 }
529 543  
530   - public void setEarAppearance(String earAppearance) {
531   - this.earAppearance = earAppearance;
  544 + public Map getSkin() {
  545 + return skin;
532 546 }
533 547  
534   - public String getCervicalMass() {
535   - return cervicalMass;
  548 + public void setSkin(Map skin) {
  549 + this.skin = skin;
536 550 }
537 551  
538   - public void setCervicalMass(String cervicalMass) {
539   - this.cervicalMass = cervicalMass;
  552 + public double getBirthWeight() {
  553 + return birthWeight;
540 554 }
541 555  
542   - public String getNose() {
543   - return nose;
  556 + public void setBirthWeight(double birthWeight) {
  557 + this.birthWeight = birthWeight;
544 558 }
545 559  
546   - public void setNose(String nose) {
547   - this.nose = nose;
  560 + public double getWeight() {
  561 + return weight;
548 562 }
549 563  
550   - public String getSkin() {
551   - return skin;
  564 + public void setWeight(double weight) {
  565 + this.weight = weight;
552 566 }
553 567  
554   - public void setSkin(String skin) {
555   - this.skin = skin;
  568 + public double getHeight() {
  569 + return height;
556 570 }
557 571  
558   - public String getMouthCavity() {
559   - return mouthCavity;
  572 + public void setHeight(double height) {
  573 + this.height = height;
560 574 }
561 575  
562   - public void setMouthCavity(String mouthCavity) {
563   - this.mouthCavity = mouthCavity;
  576 + public int getFeedType() {
  577 + return feedType;
564 578 }
565 579  
566   - public String getAnus() {
567   - return anus;
  580 + public void setFeedType(int feedType) {
  581 + this.feedType = feedType;
568 582 }
569 583  
570   - public void setAnus(String anus) {
571   - this.anus = anus;
  584 + public int getEatMilk() {
  585 + return eatMilk;
572 586 }
573 587  
574   - public String getAuscultation() {
575   - return auscultation;
  588 + public void setEatMilk(int eatMilk) {
  589 + this.eatMilk = eatMilk;
576 590 }
577 591  
578   - public void setAuscultation(String auscultation) {
579   - this.auscultation = auscultation;
  592 + public int getEatTime() {
  593 + return eatTime;
580 594 }
581 595  
582   - public String getBreast() {
583   - return breast;
  596 + public void setEatTime(int eatTime) {
  597 + this.eatTime = eatTime;
584 598 }
585 599  
586   - public void setBreast(String breast) {
587   - this.breast = breast;
  600 + public int getEmesis() {
  601 + return emesis;
588 602 }
589 603  
590   - public String getAbdominalPalpation() {
591   - return abdominalPalpation;
  604 + public void setEmesis(int emesis) {
  605 + this.emesis = emesis;
592 606 }
593 607  
594   - public void setAbdominalPalpation(String abdominalPalpation) {
595   - this.abdominalPalpation = abdominalPalpation;
  608 + public String getShit() {
  609 + return shit;
596 610 }
597 611  
598   - public String getBackbone() {
599   - return backbone;
  612 + public void setShit(String shit) {
  613 + this.shit = shit;
600 614 }
601 615  
602   - public void setBackbone(String backbone) {
603   - this.backbone = backbone;
  616 + public int getShitTimes() {
  617 + return shitTimes;
604 618 }
605 619  
606   - public String getPudendum() {
607   - return pudendum;
  620 + public void setShitTimes(int shitTimes) {
  621 + this.shitTimes = shitTimes;
608 622 }
609 623  
610   - public void setPudendum(String pudendum) {
611   - this.pudendum = pudendum;
  624 + public double getTemperature() {
  625 + return temperature;
612 626 }
613 627  
614   - public String getFunicle() {
615   - return funicle;
  628 + public void setTemperature(double temperature) {
  629 + this.temperature = temperature;
616 630 }
617 631  
618   - public void setFunicle(String funicle) {
619   - this.funicle = funicle;
  632 + public double getHeartRate() {
  633 + return heartRate;
620 634 }
621 635  
622   - public String getReferralAdvice() {
623   - return referralAdvice;
  636 + public void setHeartRate(double heartRate) {
  637 + this.heartRate = heartRate;
624 638 }
625 639  
626   - public void setReferralAdvice(String referralAdvice) {
627   - this.referralAdvice = referralAdvice;
  640 + public double getRespiratoryRate() {
  641 + return respiratoryRate;
628 642 }
629 643  
630   - public String getGuide() {
  644 + public void setRespiratoryRate(double respiratoryRate) {
  645 + this.respiratoryRate = respiratoryRate;
  646 + }
  647 +
  648 +
  649 + public List<String> getGuide() {
631 650 return guide;
632 651 }
633 652  
634   - public void setGuide(String guide) {
  653 + public void setGuide(List<String> guide) {
635 654 this.guide = guide;
636 655 }
637 656  
638 657  
639 658  
640 659  
641 660  
... ... @@ -680,22 +699,22 @@
680 699 babyVisitModel.setFjob(fjob);
681 700 babyVisitModel.setFname(fname);
682 701 babyVisitModel.setFphone(fphone);
683   - babyVisitModel.setAbdominalPalpation(abdominalPalpation);
684   - babyVisitModel.setAnus(anus);
685   - babyVisitModel.setAuscultation(auscultation);
686   - babyVisitModel.setBackbone(backbone);
  702 + babyVisitModel.setAbdominalPalpation(JsonUtil.obj2JsonString(abdominalPalpation));
  703 + babyVisitModel.setAnus(JsonUtil.obj2JsonString(anus));
  704 + babyVisitModel.setAuscultation(JsonUtil.obj2JsonString(auscultation));
  705 + babyVisitModel.setBackbone(JsonUtil.obj2JsonString(backbone));
687 706 babyVisitModel.setBirth(DateUtil.parseYMD(birth));
688   - babyVisitModel.setBirthSituation(birthSituation);
  707 + babyVisitModel.setBirthSituation(JsonUtil.obj2JsonString(birthSituation));
689 708 babyVisitModel.setBirthWeight(birthWeight);
690 709 babyVisitModel.setNextVisitAddr(nextVisitAddr);
691 710 babyVisitModel.setWeek(week);
692   - babyVisitModel.setSickenInfo(sickenInfo);
  711 + babyVisitModel.setSickenInfo(JsonUtil.obj2JsonString(sickenInfo));
693 712 babyVisitModel.setOrg(org);
694   - babyVisitModel.setBirthSituation(birthSituation);
695   - babyVisitModel.setNeonatalAsphyxia(neonatalAsphyxia);
696   - babyVisitModel.setDeformity(deformity);
  713 + babyVisitModel.setBirthSituation(JsonUtil.obj2JsonString(birthSituation));
  714 + babyVisitModel.setNeonatalAsphyxia(JsonUtil.obj2JsonString(neonatalAsphyxia));
  715 + babyVisitModel.setDeformity(JsonUtil.obj2JsonString(deformity));
697 716 babyVisitModel.setHearing(hearing);
698   - babyVisitModel.setDisease(disease);
  717 + babyVisitModel.setDisease(JsonUtil.obj2JsonString(disease));
699 718 babyVisitModel.setBirthWeight(birthWeight);
700 719 babyVisitModel.setWeight(weight);
701 720 babyVisitModel.setHeight(height);
... ... @@ -708,25 +727,26 @@
708 727 babyVisitModel.setTemperature(temperature);
709 728 babyVisitModel.setHeartRate(heartRate);
710 729 babyVisitModel.setRespiratoryRate(respiratoryRate);
711   - babyVisitModel.setComplexion(complexion);
712   - babyVisitModel.setJaundiceParts(jaundiceParts);
713   - babyVisitModel.setBregma(bregma);
714   - babyVisitModel.setEye(eye);
715   - babyVisitModel.setLimbsActivity(limbsActivity);
716   - babyVisitModel.setEarAppearance(earAppearance);
717   - babyVisitModel.setCervicalMass(cervicalMass);
718   - babyVisitModel.setNose(nose);
719   - babyVisitModel.setSkin(skin);
720   - babyVisitModel.setMouthCavity(mouthCavity);
721   - babyVisitModel.setAnus(anus);
722   - babyVisitModel.setAuscultation(auscultation);
723   - babyVisitModel.setBreast(breast);
724   - babyVisitModel.setAbdominalPalpation(abdominalPalpation);
725   - babyVisitModel.setBackbone(backbone);
726   - babyVisitModel.setPudendum(pudendum);
727   - babyVisitModel.setFunicle(funicle);
728   - babyVisitModel.setReferralAdvice(referralAdvice);
729   - babyVisitModel.setGuide(guide);
  730 +
  731 + babyVisitModel.setComplexion(JsonUtil.obj2JsonString(complexion));
  732 + babyVisitModel.setJaundiceParts(JsonUtil.obj2JsonString(jaundiceParts));
  733 + babyVisitModel.setBregma(JsonUtil.obj2JsonString(bregma));
  734 + babyVisitModel.setEye(JsonUtil.obj2JsonString(eye));
  735 + babyVisitModel.setLimbsActivity(JsonUtil.obj2JsonString(limbsActivity));
  736 + babyVisitModel.setEarAppearance(JsonUtil.obj2JsonString(earAppearance));
  737 + babyVisitModel.setCervicalMass(JsonUtil.obj2JsonString(cervicalMass));
  738 + babyVisitModel.setNose(JsonUtil.obj2JsonString(nose));
  739 + babyVisitModel.setSkin(JsonUtil.obj2JsonString(skin));
  740 + babyVisitModel.setMouthCavity(JsonUtil.obj2JsonString(mouthCavity));
  741 + babyVisitModel.setAnus(JsonUtil.obj2JsonString(anus));
  742 + babyVisitModel.setAuscultation(JsonUtil.obj2JsonString(auscultation));
  743 + babyVisitModel.setBreast(JsonUtil.obj2JsonString(breast));
  744 + babyVisitModel.setAbdominalPalpation(JsonUtil.obj2JsonString(abdominalPalpation));
  745 + babyVisitModel.setBackbone(JsonUtil.obj2JsonString(backbone));
  746 + babyVisitModel.setPudendum(JsonUtil.obj2JsonString(pudendum));
  747 + babyVisitModel.setFunicle(JsonUtil.obj2JsonString(funicle));
  748 + babyVisitModel.setReferralAdvice(JsonUtil.obj2JsonString(referralAdvice));
  749 + babyVisitModel.setGuide(JsonUtil.obj2JsonString(guide));
730 750 babyVisitModel.setCurrentVisit(DateUtil.parseYMD(currentVisit));
731 751 babyVisitModel.setNextVisitAddr(nextVisitAddr);
732 752 babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java View file @ 48a6051
... ... @@ -137,7 +137,7 @@
137 137 private String neonatalAsphyxia;
138 138  
139 139 // 是否畸形
140   - private int deformity;
  140 + private String deformity;
141 141  
142 142 // 听力情况
143 143 private int hearing;
144 144  
... ... @@ -394,11 +394,11 @@
394 394 this.neonatalAsphyxia = neonatalAsphyxia;
395 395 }
396 396  
397   - public int getDeformity() {
  397 + public String getDeformity() {
398 398 return deformity;
399 399 }
400 400  
401   - public void setDeformity(int deformity) {
  401 + public void setDeformity(String deformity) {
402 402 this.deformity = deformity;
403 403 }
404 404