jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f86cfc649672171646b76bd97afea658c322048a

Authored by baohanddd
2 parents 41344127ee 48a60515ef
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
#	platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java

Showing 9 changed files

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