diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 675933c..e4cd798 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -135,7 +135,7 @@ public class BabyCheckFacade { model.setHematuria(request.getHematuria()); model.setOtherUrine(request.getOtherUrine()); - model.setDiagnose(request.getDiagnose()); + model.setDiagnose(JsonUtil.array2JsonString(request.getDiagnose())); model.setHandlSuggest(request.getHandlSuggest()); model.setGuideSuggest(request.getGuideSuggest()); model.setCheckDoctor(request.getCheckDoctor()); @@ -477,8 +477,32 @@ public class BabyCheckFacade { model.setUrineAcetone(checkModel.getUrineAcetone()); model.setHematuria(checkModel.getHematuria()); model.setOtherUrine(checkModel.getOtherUrine()); + List> list = new ArrayList<>(); + String diagnoseStr = checkModel.getDiagnose(); + if (!StringUtils.isEmpty(diagnoseStr)) + { + List diagnoses = JsonUtil.toList(diagnoseStr,List.class); + for (Object obj : diagnoses) + { + if (obj != null) + { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setId(String.valueOf(obj)); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(datas)) + { + Map map = new HashMap<>(); + map.put("id", datas.get(0).getId()); + map.put("name",datas.get(0).getName()); + list.add(map); + } + } - model.setDiagnose(checkModel.getDiagnose()); + } + } + model.setDiagnose(list); model.setHandlSuggest(checkModel.getHandlSuggest()); model.setGuideSuggest(checkModel.getGuideSuggest()); model.setCheckDoctor(checkModel.getCheckDoctor()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 4d01071..3456cf6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.FormParam; import org.hibernate.validator.constraints.NotEmpty; +import java.util.List; import java.util.Map; /** @@ -188,7 +189,7 @@ public class BabyCheckRequest { /******诊断指导****/ //诊断 - private String diagnose; + private List diagnose; //处理意见 private String handlSuggest; @@ -398,11 +399,11 @@ public class BabyCheckRequest { this.bilirubinBelly = bilirubinBelly; } - public String getDiagnose() { + public List getDiagnose() { return diagnose; } - public void setDiagnose(String diagnose) { + public void setDiagnose(List diagnose) { this.diagnose = diagnose; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index d0cfdc7..8688770 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.result; +import java.util.List; import java.util.Map; /** @@ -179,7 +180,7 @@ public class BabyCheckResult { /******诊断指导****/ //诊断 - private String diagnose; + private List> diagnose; //处理意见 private String handlSuggest; @@ -619,11 +620,11 @@ public class BabyCheckResult { this.otherUrine = otherUrine; } - public String getDiagnose() { + public List> getDiagnose() { return diagnose; } - public void setDiagnose(String diagnose) { + public void setDiagnose(List> diagnose) { this.diagnose = diagnose; }