shiyang / regional-platform

Download as
Browse Code »

Commit 0c79a57801698f4e234c204b5c1156a175254834

Authored by jiangjiazhi
2 parents 0e332b1b5d eafc114ce1
Exists in master and in 1 other branch nobuildprocess

Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform

Showing 7 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java View file @ 0c79a57
... ... @@ -30,11 +30,11 @@
30 30 return "";
31 31 }
32 32  
33   - public static List<Map> getFyTypeEnums() {
34   - List<Map> list = new ArrayList<>();
  33 + public static List<Map<String,String>> getFyTypeEnums() {
  34 + List<Map<String,String>> list = new ArrayList<>();
35 35 for (FyTypeEnums e : FyTypeEnums.values()) {
36   - Map rootMap = new HashMap();
37   - rootMap.put("id", e.getId());
  36 + Map<String,String> rootMap = new HashMap();
  37 + rootMap.put("id", String.valueOf(e.getId()));
38 38 rootMap.put("name", e.getName());
39 39 list.add(rootMap);
40 40 }
platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java View file @ 0c79a57
... ... @@ -30,11 +30,11 @@
30 30 return "";
31 31 }
32 32  
33   - public static List<Map> getWyTypeEnums() {
34   - List<Map> list = new ArrayList<>();
  33 + public static List<Map<String,String>> getWyTypeEnums() {
  34 + List<Map<String,String>> list = new ArrayList<>();
35 35 for (WyTypeEnums e : WyTypeEnums.values()) {
36   - Map rootMap = new HashMap();
37   - rootMap.put("id", e.getId());
  36 + Map<String,String> rootMap = new HashMap();
  37 + rootMap.put("id", String.valueOf(e.getId()));
38 38 rootMap.put("name", e.getName());
39 39 list.add(rootMap);
40 40 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 0c79a57
... ... @@ -89,16 +89,19 @@
89 89 //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇
90 90 //计算规则 儿童生日 > 孕妇分娩时间 - 60 设置成分娩
91 91 Date dueDate = patients.getDueDate();
92   - Date brith = DateUtil.parseYMD(request.getBabyBirthday());
93   - Date tempDate = DateUtil.addDay(dueDate,-60);
94   - if (brith.getTime() > tempDate.getTime())
  92 + if(dueDate != null && request.getBabyBirthday() != null)
95 93 {
96   - //设置孕妇已分娩
97   - Patients patientUpdate = new Patients();
98   - patientUpdate.setId(patients.getId());
99   - patientUpdate.setYn(YnEnums.YES.getId());
100   - patientUpdate.setType(3);
101   - patientsService.updatePatient(patientUpdate);
  94 + Date brith = DateUtil.parseYMD(request.getBabyBirthday());
  95 + Date tempDate = DateUtil.addDay(dueDate,-60);
  96 + if (brith.getTime() > tempDate.getTime())
  97 + {
  98 + //设置孕妇已分娩
  99 + Patients patientUpdate = new Patients();
  100 + patientUpdate.setId(patients.getId());
  101 + patientUpdate.setYn(YnEnums.YES.getId());
  102 + patientUpdate.setType(3);
  103 + patientsService.updatePatient(patientUpdate);
  104 + }
102 105 }
103 106  
104 107 }
... ... @@ -228,7 +231,7 @@
228 231 //bm.setHighRiskReason(b.getHighRiskReason());
229 232 bm.setExpVip(b.getExpVip());
230 233 bm.setMremark(b.getMremark());
231   - bm.setDiagnose(JsonUtil.obj2JsonString(b.getDiagnose()));
  234 + bm.setDiagnose(JsonUtil.array2JsonString(b.getDiagnose()));
232 235  
233 236 if (b.getExpType() != null)
234 237 {
... ... @@ -353,7 +356,35 @@
353 356 //result.setHighRiskReason(model.getHighRiskReason());
354 357 result.setExpVip(model.getExpVip());
355 358 result.setMremark(model.getMremark() == null ? "" : model.getMremark());
356   - result.setDiagnose(JsonUtil.toList(model.getDiagnose(),List.class));
  359 +
  360 + List<Map<String, String>> list = new ArrayList<>();
  361 + String diagnoseStr = model.getDiagnose();
  362 + if (!StringUtils.isEmpty(diagnoseStr))
  363 + {
  364 + List diagnoses = JsonUtil.toList(diagnoseStr,List.class);
  365 + for (Object obj : diagnoses)
  366 + {
  367 + if (obj != null)
  368 + {
  369 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  370 + basicConfigQuery.setYn(YnEnums.YES.getId());
  371 + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
  372 + basicConfigQuery.setId(String.valueOf(obj));
  373 + List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
  374 + if (CollectionUtils.isNotEmpty(datas))
  375 + {
  376 + Map<String,String> map = new HashMap<>();
  377 + map.put("id", datas.get(0).getId());
  378 + map.put("name",datas.get(0).getName());
  379 + list.add(map);
  380 + }
  381 + }
  382 +
  383 + }
  384 + }
  385 + result.setDiagnose(list);
  386 +
  387 +
357 388 //result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime()));
358 389 result.setServiceStatus(String.valueOf(model.getServiceStatus()));
359 390  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 0c79a57
... ... @@ -94,7 +94,7 @@
94 94  
95 95  
96 96 model.setTemperature(request.getTemperature());
97   - model.setWeight(request.getHeight());
  97 + model.setHeight(request.getHeight());
98 98 model.setWeight(request.getWeight());
99 99 model.setHead(request.getHead());
100 100 model.setHeightWeight(request.getHeightWeight());
... ... @@ -135,7 +135,7 @@
135 135 model.setHematuria(request.getHematuria());
136 136 model.setOtherUrine(request.getOtherUrine());
137 137  
138   - model.setDiagnose(request.getDiagnose());
  138 + model.setDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
139 139 model.setHandlSuggest(request.getHandlSuggest());
140 140 model.setGuideSuggest(request.getGuideSuggest());
141 141 model.setCheckDoctor(request.getCheckDoctor());
... ... @@ -146,6 +146,8 @@
146 146 model.setChestw(request.getChestw());
147 147  
148 148  
  149 +
  150 +
149 151 model.setCheckDate(DateUtil.parseYMD(request.getCheckDate()));
150 152  
151 153 return model;
... ... @@ -232,7 +234,7 @@
232 234 if (CollectionUtils.isNotEmpty(datas)) {
233 235 Map map = new HashMap();
234 236 map.put("id", did);
235   - map.put("diagnose", datas.get(0).getName());
  237 + map.put("name", datas.get(0).getName());
236 238 dlist.add(map);
237 239 }
238 240  
... ... @@ -418,7 +420,7 @@
418 420 */
419 421 private BabyCheckResult getBabyCheckResult(BabyCheckModel checkModel) {
420 422 BabyCheckResult model = new BabyCheckResult();
421   - model.setId(model.getId());
  423 + model.setId(checkModel.getId());
422 424  
423 425 model.setBuildId(checkModel.getBuildId());
424 426  
... ... @@ -435,7 +437,7 @@
435 437  
436 438  
437 439 model.setTemperature(checkModel.getTemperature());
438   - model.setWeight(checkModel.getHeight());
  440 + model.setHeight(checkModel.getHeight());
439 441 model.setWeight(checkModel.getWeight());
440 442 model.setHead(checkModel.getHead());
441 443 model.setHeightWeight(checkModel.getHeightWeight());
442 444  
443 445  
444 446  
... ... @@ -475,15 +477,40 @@
475 477 model.setUrineAcetone(checkModel.getUrineAcetone());
476 478 model.setHematuria(checkModel.getHematuria());
477 479 model.setOtherUrine(checkModel.getOtherUrine());
  480 + List<Map<String, String>> list = new ArrayList<>();
  481 + String diagnoseStr = checkModel.getDiagnose();
  482 + if (!StringUtils.isEmpty(diagnoseStr))
  483 + {
  484 + List diagnoses = JsonUtil.toList(diagnoseStr,List.class);
  485 + for (Object obj : diagnoses)
  486 + {
  487 + if (obj != null)
  488 + {
  489 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  490 + basicConfigQuery.setYn(YnEnums.YES.getId());
  491 + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
  492 + basicConfigQuery.setId(String.valueOf(obj));
  493 + List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
  494 + if (CollectionUtils.isNotEmpty(datas))
  495 + {
  496 + Map<String,String> map = new HashMap<>();
  497 + map.put("id", datas.get(0).getId());
  498 + map.put("name",datas.get(0).getName());
  499 + list.add(map);
  500 + }
  501 + }
478 502  
479   - model.setDiagnose(checkModel.getDiagnose());
  503 + }
  504 + }
  505 + model.setDiagnose(list);
480 506 model.setHandlSuggest(checkModel.getHandlSuggest());
481 507 model.setGuideSuggest(checkModel.getGuideSuggest());
482 508 model.setCheckDoctor(checkModel.getCheckDoctor());
483 509 model.setNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
484 510 model.setHighRisk(checkModel.getHighRisk());
  511 + model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
485 512  
486   - model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getBregma(), Map.class));
  513 + model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getDrugGllergic(), Map.class));
487 514 model.setChestw(checkModel.getChestw());
488 515  
489 516 return model;
... ... @@ -582,7 +609,7 @@
582 609  
583 610 //查询该月龄的年龄别体重值
584 611 List<AwModel> aws = babyCheckService.queryAwByHeight(monthAge, sex);
585   - if (CollectionUtils.isNotEmpty(aws) && aws.size() > 2)
  612 + if (CollectionUtils.isNotEmpty(aws) && aws.size() > 1)
586 613 {
587 614 AwModel model = aws.get(0);
588 615 AwModel model1 = aws.get(1);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ 0c79a57
... ... @@ -162,21 +162,21 @@
162 162 if (request.getServiceObj() != null && request.getServiceObj() == 0)
163 163 {
164 164 //查询全部
165   - request.setServiceObj(null);
  165 + query.setServiceObj(null);
166 166 }
167 167  
168 168 if (request.getSmsType() != null && request.getSmsType() == 0)
169 169 {
170   - request.setSmsType(null);
  170 + query.setSmsType(null);
171 171 }
172 172 if (request.getServiceType() != null && request.getServiceType() == 100)
173 173 {
174   - request.setServiceType(null);
  174 + query.setServiceType(null);
175 175 }
176 176  
177 177 if (request.getServiceStatus() != null && (request.getServiceStatus() == 101 || request.getServiceStatus() == 102 || request.getServiceStatus() == 103))
178 178 {
179   - request.setServiceType(null);
  179 + query.setServiceType(null);
180 180 }
181 181  
182 182 List<SmsTemplateModel> templates = smsTemplateService.querySmsTemplates(query);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java View file @ 0c79a57
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.core.annotation.form.FormParam;
4 4 import org.hibernate.validator.constraints.NotEmpty;
5 5  
  6 +import java.util.List;
6 7 import java.util.Map;
7 8  
8 9 /**
... ... @@ -188,7 +189,7 @@
188 189 /******诊断指导****/
189 190  
190 191 //诊断
191   - private String diagnose;
  192 + private List<String> diagnose;
192 193  
193 194 //处理意见
194 195 private String handlSuggest;
195 196  
... ... @@ -398,11 +399,11 @@
398 399 this.bilirubinBelly = bilirubinBelly;
399 400 }
400 401  
401   - public String getDiagnose() {
  402 + public List<String> getDiagnose() {
402 403 return diagnose;
403 404 }
404 405  
405   - public void setDiagnose(String diagnose) {
  406 + public void setDiagnose(List<String> diagnose) {
406 407 this.diagnose = diagnose;
407 408 }
408 409  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ 0c79a57
1 1 package com.lyms.platform.operate.web.result;
2 2  
  3 +import java.util.List;
3 4 import java.util.Map;
4 5  
5 6 /**
... ... @@ -179,7 +180,7 @@
179 180 /******诊断指导****/
180 181  
181 182 //诊断
182   - private String diagnose;
  183 + private List<Map<String,String>> diagnose;
183 184  
184 185 //处理意见
185 186 private String handlSuggest;
... ... @@ -196,6 +197,17 @@
196 197 //是否高危儿童 0 非高危 1高危
197 198 private Integer highRisk;
198 199  
  200 + //检查时间
  201 + private String checkDate;
  202 +
  203 + public String getCheckDate() {
  204 + return checkDate;
  205 + }
  206 +
  207 + public void setCheckDate(String checkDate) {
  208 + this.checkDate = checkDate;
  209 + }
  210 +
199 211 public Map getDrugGllergic() {
200 212 return drugGllergic;
201 213 }
202 214  
... ... @@ -608,11 +620,11 @@
608 620 this.otherUrine = otherUrine;
609 621 }
610 622  
611   - public String getDiagnose() {
  623 + public List<Map<String, String>> getDiagnose() {
612 624 return diagnose;
613 625 }
614 626  
615   - public void setDiagnose(String diagnose) {
  627 + public void setDiagnose(List<Map<String, String>> diagnose) {
616 628 this.diagnose = diagnose;
617 629 }
618 630