Commit b02736a247abbab5fe6663e0427842d389f63cd6
1 parent
5302316f2a
Exists in
master
and in
1 other branch
update code
Showing 3 changed files with 579 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
View file @
b02736a
... | ... | @@ -121,11 +121,23 @@ |
121 | 121 | * @param id 儿童建档id |
122 | 122 | * @return |
123 | 123 | */ |
124 | - @RequestMapping(value = "/getBabyBuildInfo/{id}", method = RequestMethod.GET) | |
124 | + @RequestMapping(value = "/getBabyBuildPageInfo/{id}", method = RequestMethod.GET) | |
125 | 125 | @ResponseBody |
126 | 126 | public BaseObjectResponse getBabyBuildInfo(@PathVariable("id")String id){ |
127 | 127 | return viewFacade.getBabyBuildInfo(id); |
128 | 128 | } |
129 | + | |
130 | + /** | |
131 | + * 儿童检查查看页面 | |
132 | + * @param id 儿童建档id | |
133 | + * @return | |
134 | + */ | |
135 | + @RequestMapping(value = "/getBabyCheckPageInfo/{id}", method = RequestMethod.GET) | |
136 | + @ResponseBody | |
137 | + public BaseObjectResponse getBabyCheckPageInfo(@PathVariable("id")String id){ | |
138 | + return viewFacade.getBabyBuildInfo(id); | |
139 | + } | |
140 | + | |
129 | 141 | |
130 | 142 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
b02736a
... | ... | @@ -1507,7 +1507,7 @@ |
1507 | 1507 | result.setMommyProfessionType(getBasicConfig(model.getMproTypeId())); |
1508 | 1508 | |
1509 | 1509 | result.setFatherLevel(getBasicConfig(model.getfLevelId())); |
1510 | - result.setFatherProfessionType(model.getFproTypeId()); | |
1510 | + result.setFatherProfessionType(getBasicConfig(model.getFproTypeId())); | |
1511 | 1511 | if (StringUtils.isNotEmpty(model.getDeliverOrg())) |
1512 | 1512 | { |
1513 | 1513 | Organization organization = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
View file @
b02736a
1 | +package com.lyms.platform.operate.web.result; | |
2 | + | |
3 | +import com.lyms.platform.common.base.IBasicResultConvert; | |
4 | +import com.lyms.platform.common.enums.FmTypeEnums; | |
5 | +import com.lyms.platform.common.enums.ServiceStatusEnums; | |
6 | +import com.lyms.platform.common.enums.ServiceTypeEnums; | |
7 | +import com.lyms.platform.common.enums.SexEnum; | |
8 | +import com.lyms.platform.common.utils.DateUtil; | |
9 | +import com.lyms.platform.common.utils.JsonUtil; | |
10 | +import com.lyms.platform.common.utils.StringUtils; | |
11 | +import com.lyms.platform.operate.web.utils.CommonsHelper; | |
12 | +import com.lyms.platform.pojo.BabyModel; | |
13 | + | |
14 | +import java.util.Date; | |
15 | +import java.util.List; | |
16 | +import java.util.Map; | |
17 | + | |
18 | +/** | |
19 | + * Created by lqy on 2016/6/17. | |
20 | + */ | |
21 | +public class BabyPageResult implements IBasicResultConvert<BabyPageResult,BabyModel> { | |
22 | + | |
23 | + //建档Id | |
24 | + private String id; | |
25 | + | |
26 | + //建档Id | |
27 | + private String pid; | |
28 | + | |
29 | + /***********儿童基本信息***************/ | |
30 | + | |
31 | + //儿童名称 | |
32 | + private String babyName; | |
33 | + | |
34 | + //儿童性别 | |
35 | + private String sex; | |
36 | + | |
37 | + //儿童生日 | |
38 | + private String babyBirthday; | |
39 | + | |
40 | + //月龄 | |
41 | + private String monthAge; | |
42 | + | |
43 | + //家庭住址 | |
44 | + private String homeAddress; | |
45 | + | |
46 | + //儿童身份证 | |
47 | + private String babyCardNo; | |
48 | + | |
49 | + | |
50 | + /***********母亲基本信息***********/ | |
51 | + | |
52 | + //母亲名称 | |
53 | + private String mommyName; | |
54 | + | |
55 | + //证件类型 | |
56 | + private String mommyCertificateType; | |
57 | + | |
58 | + //证件号号 | |
59 | + private String mommyCertificateNum; | |
60 | + | |
61 | + //母亲生日 | |
62 | + private String mommyBirthday; | |
63 | + | |
64 | + //母亲年龄 | |
65 | + private String mommyAge; | |
66 | + | |
67 | + //母亲联系方式 | |
68 | + private String mommyPhone; | |
69 | + | |
70 | + //文化程度ID | |
71 | + private String mommyLevel; | |
72 | + | |
73 | + //母亲居住类别 | |
74 | +// private String mommyLiveType; | |
75 | + | |
76 | + //职业类别 | |
77 | + private String mommyProfessionType; | |
78 | + | |
79 | + /***********父亲基本信息***********/ | |
80 | + | |
81 | + //父亲姓名 | |
82 | + private String fatherName; | |
83 | + | |
84 | + //父亲联系方式 | |
85 | + private String fatherPhone; | |
86 | + | |
87 | + //父亲生日 | |
88 | + private String fatherBirthday; | |
89 | + | |
90 | + //父亲年龄 | |
91 | + private String fatherAge; | |
92 | + | |
93 | + //父亲文化程度ID | |
94 | + private String fatherLevel; | |
95 | + | |
96 | + //职业类别 | |
97 | + private String fatherProfessionType; | |
98 | + | |
99 | + | |
100 | + | |
101 | + /***********分娩信息***********/ | |
102 | + | |
103 | + //分娩孕周 | |
104 | + private String dueWeek; | |
105 | + //分娩方式 | |
106 | + private String dueType; | |
107 | + //胎产次 | |
108 | + private String fetusCount; | |
109 | + | |
110 | + //体重 | |
111 | + private String babyWeight; | |
112 | + //身高 | |
113 | + private String babyHeight; | |
114 | + //头围 | |
115 | + private String babyHead; | |
116 | + //分娩医院 | |
117 | + private String deliverOrg; | |
118 | + | |
119 | + //是否畸形 0非畸形 1畸形 | |
120 | + private String malformation; | |
121 | + | |
122 | + | |
123 | + /***********高危及诊断***********/ | |
124 | + | |
125 | + //母亲高危因素 | |
126 | + private String mommyHighRiskReason; | |
127 | + | |
128 | + //是否高危 0 非高危 1高危 | |
129 | + private String highRisk; | |
130 | + | |
131 | + //儿童出院诊断 | |
132 | + private String babyDiagnosis; | |
133 | + | |
134 | + //诊断 | |
135 | + private String diagnose; | |
136 | + | |
137 | + //apgar评分 | |
138 | + private String apgarScore; | |
139 | + | |
140 | + | |
141 | + | |
142 | + /***********院内信息***********/ | |
143 | + | |
144 | + //建档医生 | |
145 | + private String buildDoctor; | |
146 | + //建档日期 | |
147 | + private String buildDate; | |
148 | + //服务类型 | |
149 | + private String serviceType; | |
150 | + //服务状态 | |
151 | + private String serviceStatus; | |
152 | + //就诊卡号 | |
153 | + private String vcCardNo; | |
154 | + //备注 | |
155 | + private String remark; | |
156 | + //病历号(住院号) | |
157 | + private String blNo; | |
158 | + | |
159 | + | |
160 | + public String getId() { | |
161 | + return id; | |
162 | + } | |
163 | + | |
164 | + public void setId(String id) { | |
165 | + this.id = id; | |
166 | + } | |
167 | + | |
168 | + public String getPid() { | |
169 | + return pid; | |
170 | + } | |
171 | + | |
172 | + public void setPid(String pid) { | |
173 | + this.pid = pid; | |
174 | + } | |
175 | + | |
176 | + public String getBabyName() { | |
177 | + return babyName; | |
178 | + } | |
179 | + | |
180 | + public void setBabyName(String babyName) { | |
181 | + this.babyName = babyName; | |
182 | + } | |
183 | + | |
184 | + public String getSex() { | |
185 | + return sex; | |
186 | + } | |
187 | + | |
188 | + public void setSex(String sex) { | |
189 | + this.sex = sex; | |
190 | + } | |
191 | + | |
192 | + public String getBabyBirthday() { | |
193 | + return babyBirthday; | |
194 | + } | |
195 | + | |
196 | + public void setBabyBirthday(String babyBirthday) { | |
197 | + this.babyBirthday = babyBirthday; | |
198 | + } | |
199 | + | |
200 | + public String getMonthAge() { | |
201 | + return monthAge; | |
202 | + } | |
203 | + | |
204 | + public void setMonthAge(String monthAge) { | |
205 | + this.monthAge = monthAge; | |
206 | + } | |
207 | + | |
208 | + public String getHomeAddress() { | |
209 | + return homeAddress; | |
210 | + } | |
211 | + | |
212 | + public void setHomeAddress(String homeAddress) { | |
213 | + this.homeAddress = homeAddress; | |
214 | + } | |
215 | + | |
216 | + public String getBabyCardNo() { | |
217 | + return babyCardNo; | |
218 | + } | |
219 | + | |
220 | + public void setBabyCardNo(String babyCardNo) { | |
221 | + this.babyCardNo = babyCardNo; | |
222 | + } | |
223 | + | |
224 | + public String getMommyName() { | |
225 | + return mommyName; | |
226 | + } | |
227 | + | |
228 | + public void setMommyName(String mommyName) { | |
229 | + this.mommyName = mommyName; | |
230 | + } | |
231 | + | |
232 | + public String getMommyCertificateType() { | |
233 | + return mommyCertificateType; | |
234 | + } | |
235 | + | |
236 | + public void setMommyCertificateType(String mommyCertificateType) { | |
237 | + this.mommyCertificateType = mommyCertificateType; | |
238 | + } | |
239 | + | |
240 | + public String getMommyCertificateNum() { | |
241 | + return mommyCertificateNum; | |
242 | + } | |
243 | + | |
244 | + public void setMommyCertificateNum(String mommyCertificateNum) { | |
245 | + this.mommyCertificateNum = mommyCertificateNum; | |
246 | + } | |
247 | + | |
248 | + public String getMommyBirthday() { | |
249 | + return mommyBirthday; | |
250 | + } | |
251 | + | |
252 | + public void setMommyBirthday(String mommyBirthday) { | |
253 | + this.mommyBirthday = mommyBirthday; | |
254 | + } | |
255 | + | |
256 | + public String getMommyAge() { | |
257 | + return mommyAge; | |
258 | + } | |
259 | + | |
260 | + public void setMommyAge(String mommyAge) { | |
261 | + this.mommyAge = mommyAge; | |
262 | + } | |
263 | + | |
264 | + public String getMommyPhone() { | |
265 | + return mommyPhone; | |
266 | + } | |
267 | + | |
268 | + public void setMommyPhone(String mommyPhone) { | |
269 | + this.mommyPhone = mommyPhone; | |
270 | + } | |
271 | + | |
272 | + public String getMommyLevel() { | |
273 | + return mommyLevel; | |
274 | + } | |
275 | + | |
276 | + public void setMommyLevel(String mommyLevel) { | |
277 | + this.mommyLevel = mommyLevel; | |
278 | + } | |
279 | + | |
280 | + | |
281 | + public String getMommyProfessionType() { | |
282 | + return mommyProfessionType; | |
283 | + } | |
284 | + | |
285 | + public void setMommyProfessionType(String mommyProfessionType) { | |
286 | + this.mommyProfessionType = mommyProfessionType; | |
287 | + } | |
288 | + | |
289 | + public String getFatherName() { | |
290 | + return fatherName; | |
291 | + } | |
292 | + | |
293 | + public void setFatherName(String fatherName) { | |
294 | + this.fatherName = fatherName; | |
295 | + } | |
296 | + | |
297 | + public String getFatherPhone() { | |
298 | + return fatherPhone; | |
299 | + } | |
300 | + | |
301 | + public void setFatherPhone(String fatherPhone) { | |
302 | + this.fatherPhone = fatherPhone; | |
303 | + } | |
304 | + | |
305 | + public String getFatherBirthday() { | |
306 | + return fatherBirthday; | |
307 | + } | |
308 | + | |
309 | + public void setFatherBirthday(String fatherBirthday) { | |
310 | + this.fatherBirthday = fatherBirthday; | |
311 | + } | |
312 | + | |
313 | + public String getFatherAge() { | |
314 | + return fatherAge; | |
315 | + } | |
316 | + | |
317 | + public void setFatherAge(String fatherAge) { | |
318 | + this.fatherAge = fatherAge; | |
319 | + } | |
320 | + | |
321 | + public String getFatherLevel() { | |
322 | + return fatherLevel; | |
323 | + } | |
324 | + | |
325 | + public void setFatherLevel(String fatherLevel) { | |
326 | + this.fatherLevel = fatherLevel; | |
327 | + } | |
328 | + | |
329 | + public String getFatherProfessionType() { | |
330 | + return fatherProfessionType; | |
331 | + } | |
332 | + | |
333 | + public void setFatherProfessionType(String fatherProfessionType) { | |
334 | + this.fatherProfessionType = fatherProfessionType; | |
335 | + } | |
336 | + | |
337 | + public String getDueWeek() { | |
338 | + return dueWeek; | |
339 | + } | |
340 | + | |
341 | + public void setDueWeek(String dueWeek) { | |
342 | + this.dueWeek = dueWeek; | |
343 | + } | |
344 | + | |
345 | + public String getDueType() { | |
346 | + return dueType; | |
347 | + } | |
348 | + | |
349 | + public void setDueType(String dueType) { | |
350 | + this.dueType = dueType; | |
351 | + } | |
352 | + | |
353 | + public String getFetusCount() { | |
354 | + return fetusCount; | |
355 | + } | |
356 | + | |
357 | + public void setFetusCount(String fetusCount) { | |
358 | + this.fetusCount = fetusCount; | |
359 | + } | |
360 | + | |
361 | + public String getBabyWeight() { | |
362 | + return babyWeight; | |
363 | + } | |
364 | + | |
365 | + public void setBabyWeight(String babyWeight) { | |
366 | + this.babyWeight = babyWeight; | |
367 | + } | |
368 | + | |
369 | + public String getBabyHeight() { | |
370 | + return babyHeight; | |
371 | + } | |
372 | + | |
373 | + public void setBabyHeight(String babyHeight) { | |
374 | + this.babyHeight = babyHeight; | |
375 | + } | |
376 | + | |
377 | + public String getBabyHead() { | |
378 | + return babyHead; | |
379 | + } | |
380 | + | |
381 | + public void setBabyHead(String babyHead) { | |
382 | + this.babyHead = babyHead; | |
383 | + } | |
384 | + | |
385 | + public String getDeliverOrg() { | |
386 | + return deliverOrg; | |
387 | + } | |
388 | + | |
389 | + public void setDeliverOrg(String deliverOrg) { | |
390 | + this.deliverOrg = deliverOrg; | |
391 | + } | |
392 | + | |
393 | + public String getMalformation() { | |
394 | + return malformation; | |
395 | + } | |
396 | + | |
397 | + public void setMalformation(String malformation) { | |
398 | + this.malformation = malformation; | |
399 | + } | |
400 | + | |
401 | + public String getMommyHighRiskReason() { | |
402 | + return mommyHighRiskReason; | |
403 | + } | |
404 | + | |
405 | + public void setMommyHighRiskReason(String mommyHighRiskReason) { | |
406 | + this.mommyHighRiskReason = mommyHighRiskReason; | |
407 | + } | |
408 | + | |
409 | + public String getHighRisk() { | |
410 | + return highRisk; | |
411 | + } | |
412 | + | |
413 | + public void setHighRisk(String highRisk) { | |
414 | + this.highRisk = highRisk; | |
415 | + } | |
416 | + | |
417 | + public String getBabyDiagnosis() { | |
418 | + return babyDiagnosis; | |
419 | + } | |
420 | + | |
421 | + public void setBabyDiagnosis(String babyDiagnosis) { | |
422 | + this.babyDiagnosis = babyDiagnosis; | |
423 | + } | |
424 | + | |
425 | + | |
426 | + public String getApgarScore() { | |
427 | + return apgarScore; | |
428 | + } | |
429 | + | |
430 | + public void setApgarScore(String apgarScore) { | |
431 | + this.apgarScore = apgarScore; | |
432 | + } | |
433 | + | |
434 | + public String getDiagnose() { | |
435 | + return diagnose; | |
436 | + } | |
437 | + | |
438 | + public void setDiagnose(String diagnose) { | |
439 | + this.diagnose = diagnose; | |
440 | + } | |
441 | + | |
442 | + public String getBuildDoctor() { | |
443 | + return buildDoctor; | |
444 | + } | |
445 | + | |
446 | + public void setBuildDoctor(String buildDoctor) { | |
447 | + this.buildDoctor = buildDoctor; | |
448 | + } | |
449 | + | |
450 | + public String getBuildDate() { | |
451 | + return buildDate; | |
452 | + } | |
453 | + | |
454 | + public void setBuildDate(String buildDate) { | |
455 | + this.buildDate = buildDate; | |
456 | + } | |
457 | + | |
458 | + public String getServiceType() { | |
459 | + return serviceType; | |
460 | + } | |
461 | + | |
462 | + public void setServiceType(String serviceType) { | |
463 | + this.serviceType = serviceType; | |
464 | + } | |
465 | + | |
466 | + public String getServiceStatus() { | |
467 | + return serviceStatus; | |
468 | + } | |
469 | + | |
470 | + public void setServiceStatus(String serviceStatus) { | |
471 | + this.serviceStatus = serviceStatus; | |
472 | + } | |
473 | + | |
474 | + public String getVcCardNo() { | |
475 | + return vcCardNo; | |
476 | + } | |
477 | + | |
478 | + public void setVcCardNo(String vcCardNo) { | |
479 | + this.vcCardNo = vcCardNo; | |
480 | + } | |
481 | + | |
482 | + public String getRemark() { | |
483 | + return remark; | |
484 | + } | |
485 | + | |
486 | + public void setRemark(String remark) { | |
487 | + this.remark = remark; | |
488 | + } | |
489 | + | |
490 | + public String getBlNo() { | |
491 | + return blNo; | |
492 | + } | |
493 | + | |
494 | + public void setBlNo(String blNo) { | |
495 | + this.blNo = blNo; | |
496 | + } | |
497 | + | |
498 | + @Override | |
499 | + public BabyPageResult convertToResult(BabyModel destModel) { | |
500 | + | |
501 | + setId(destModel.getId()); | |
502 | + setPid(destModel.getPid()); | |
503 | + setBabyName(destModel.getName()); | |
504 | + setSex(SexEnum.getTextById(destModel.getSex())); | |
505 | + setBabyBirthday(DateUtil.getyyyy_MM_dd(destModel.getBirth())); | |
506 | + setMonthAge(DateUtil.getBabyMonthAge(destModel.getBirth(), new Date())); | |
507 | + | |
508 | + setBabyCardNo(destModel.getCardNo()); | |
509 | + setMommyName(destModel.getMname()); | |
510 | + setMommyCertificateNum(destModel.getMcertNo()); | |
511 | + setMommyPhone(destModel.getMphone()); | |
512 | + setMommyBirthday(DateUtil.getyyyy_MM_dd(destModel.getMbirth())); | |
513 | + if (destModel.getMbirth() != null) | |
514 | + { | |
515 | + setMommyAge(DateUtil.getAge(destModel.getMbirth(), new Date()) + ""); | |
516 | + } | |
517 | + | |
518 | + setFatherName(destModel.getFname()); | |
519 | + setFatherBirthday(DateUtil.getyyyy_MM_dd(destModel.getFbirth())); | |
520 | + if (destModel.getFbirth() != null) | |
521 | + { | |
522 | + setFatherAge(DateUtil.getAge(destModel.getFbirth(), new Date()) + ""); | |
523 | + } | |
524 | + | |
525 | + setFatherPhone(destModel.getFphone()); | |
526 | + | |
527 | + if (destModel.getDueWeek() != null) | |
528 | + { | |
529 | + setDueWeek(destModel.getDueWeek() + "周"); | |
530 | + } | |
531 | + | |
532 | + setDueType(FmTypeEnums.getFmNameById(destModel.getDueType())); | |
533 | + | |
534 | + if (StringUtils.isNotEmpty(destModel.getFetusCount()) && StringUtils.isNotEmpty(destModel.getDueCount())) | |
535 | + { | |
536 | + setFetusCount("第"+destModel.getFetusCount()+"胎/第"+destModel.getDueCount()+"次"); | |
537 | + } | |
538 | + | |
539 | + setBabyWeight(destModel.getBabyWeight()); | |
540 | + | |
541 | + setBabyHeight(destModel.getBabyHeight()); | |
542 | + setBabyHead(destModel.getBabyHead()); | |
543 | + if (StringUtils.isNotEmpty(destModel.getApgarScore())) | |
544 | + { | |
545 | + Map<String,String> map = JsonUtil.getMap(destModel.getApgarScore()); | |
546 | + String as = (map.get("pf1") == null ? "" : map.get("pf1"))+"分 - "+(map.get("pf5") == null ? "" : map.get("pf5"))+"分 - " +(map.get("pf10") == null ? "" : map.get("pf10"))+"分"; | |
547 | + setApgarScore(as); | |
548 | + } | |
549 | + | |
550 | + // 0非畸形 1畸形 | |
551 | + setMalformation(destModel.getMalformation() == 1 ? "是" : "否"); | |
552 | + //0 非高危 1高危 | |
553 | + setHighRisk(destModel.getHighRisk() == 1 ? "是" : "否"); | |
554 | + setBabyDiagnosis(destModel.getBabyDiagnosis()); | |
555 | + setVcCardNo(destModel.getVcCardNo()); | |
556 | + setBlNo(destModel.getBlNo()); | |
557 | + | |
558 | + setBuildDate(DateUtil.getyyyy_MM_dd(destModel.getBuildDate())); | |
559 | + setRemark(destModel.getMremark()); | |
560 | + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus())); | |
561 | + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType())); | |
562 | + | |
563 | + return this; | |
564 | + } | |
565 | +} |