diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java index 605c384..0390a8a 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.model; import java.util.Date; +import java.util.List; public class BabyPatientExtendEarHearingDiagnose { @@ -35,6 +36,10 @@ public class BabyPatientExtendEarHearingDiagnose { /** * 高危因素 */ + private List highFactors; + /** + * 高危因素 + */ private String highFactorStr; /** @@ -448,6 +453,10 @@ public class BabyPatientExtendEarHearingDiagnose { /** * 诊断结果 */ + private List diagnResults; + /** + * 诊断结果 + */ private String diagnResultStr; /** * 确诊结果 @@ -456,6 +465,11 @@ public class BabyPatientExtendEarHearingDiagnose { /** * 确诊结果 */ + private List confirmResults; + + /** + * 确诊结果 + */ private String confirmResultStr; /** * 确诊时间 @@ -534,6 +548,22 @@ public class BabyPatientExtendEarHearingDiagnose { return confirmResultStr; } + public List getDiagnResults() { + return diagnResults; + } + + public void setDiagnResults(List diagnResults) { + this.diagnResults = diagnResults; + } + + public List getConfirmResults() { + return confirmResults; + } + + public void setConfirmResults(List confirmResults) { + this.confirmResults = confirmResults; + } + public void setConfirmResultStr(String confirmResultStr) { this.confirmResultStr = confirmResultStr; } @@ -714,6 +744,14 @@ public class BabyPatientExtendEarHearingDiagnose { this.abrThrLeftShieldDbnhl = abrThrLeftShieldDbnhl; } + public List getHighFactors() { + return highFactors; + } + + public void setHighFactors(List highFactors) { + this.highFactors = highFactors; + } + public String getAbrThrRightDbnhl() { return abrThrRightDbnhl; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 8954842..0583e4d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -17,6 +17,7 @@ import com.lyms.platform.operate.web.result.InitHearingDiagnose; import com.lyms.platform.operate.web.result.InitHearingDiagnoseListData; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -163,14 +164,24 @@ public class EarController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") @ResponseBody - public BaseResponse initHearingDiagnose() { - + public BaseResponse initHearingDiagnose(String babyId) { //根据条件查询基础配置信息表 InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); initHearingDiagnose.setHandlingSuggestion(HdEnums.getHandlingSuggestionEnums()); + + //查询最后一次听诊时间 + //查询听诊记录 + BabyPatientExtendEarHearingDiagnoseQuery hdQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); + hdQuery.setBabyId(babyId); + hdQuery.setSort("diagnose_time"); + List hdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hdQuery); + if(CollectionUtils.isNotEmpty(hdList)){ + BabyPatientExtendEarHearingDiagnose ehd = hdList.get(hdList.size()-1); + initHearingDiagnose.setDiagnoseTime(DateUtil.getyyyy_MM_dd(ehd.getDiagnoseTime())); + } return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 37bdcd0..be782dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.alibaba.fastjson.JSONObject; import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.common.annotation.TokenRequired; @@ -148,13 +149,20 @@ public class HearingDiagnoseController extends BaseController { if (StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum { StringBuffer hfBuff = new StringBuffer(); + List highArr = new ArrayList(); + String[] highFactors = behd.getHighFactor().split(","); for (String hf : highFactors) { if (StringUtils.isNotEmpty(hf)) { String name = HighRiskEnum.getTitle(Integer.parseInt(hf)); hfBuff.append(name + "、"); + JSONObject confiJo = new JSONObject(); + confiJo.put("id",hf); + confiJo.put("name",name); + highArr.add(confiJo); } } + behd.setHighFactors(highArr); behd.setHighFactorStr(hfBuff.toString()); } @@ -175,26 +183,42 @@ public class HearingDiagnoseController extends BaseController { { StringBuffer hfBuff = new StringBuffer(); String[] highFactors = behd.getConfirmResult().split(","); + List confiArr = new ArrayList(); for (String hf : highFactors) { if (StringUtils.isNotEmpty(hf)) { String name = ConfirmedEnums.getTitle(Integer.parseInt(hf)); + JSONObject confiJo = new JSONObject(); + confiJo.put("id",hf); + confiJo.put("name",name); + confiArr.add(confiJo); hfBuff.append(name + "、"); } } + behd.setConfirmResults(confiArr); behd.setConfirmResultStr(hfBuff.toString()); + }else{ + behd.setConfirmResults(new ArrayList()); } if (StringUtils.isNotEmpty(behd.getDiagnResult()))//诊断内容转换 HearingDiagnosisEnums { StringBuffer hfBuff = new StringBuffer(); - String[] highFactors = behd.getConfirmResult().split(","); + List diagnArr = new ArrayList(); + String[] highFactors = behd.getDiagnResult().split(","); for (String hf : highFactors) { if (StringUtils.isNotEmpty(hf)) { String name = HearingDiagnosisEnums.getTitle(Integer.parseInt(hf)); + JSONObject confiJo = new JSONObject(); + confiJo.put("id",hf); + confiJo.put("name",name); + diagnArr.add(confiJo); hfBuff.append(name + "、"); } } behd.setDiagnResultStr(hfBuff.toString()); + behd.setDiagnResults(diagnArr); + }else{ + behd.setConfirmResults(new ArrayList()); } if(behd.getDiagnHandSugge()!=null){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java index bbe5711..4520e85 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java @@ -19,6 +19,16 @@ public class InitHearingDiagnose extends BaseResponse{ private List> confirmResult; //处理意见 private List handlingSuggestion; + //最后一次听诊时间 + private String diagnoseTime; + + public String getDiagnoseTime() { + return diagnoseTime; + } + + public void setDiagnoseTime(String diagnoseTime) { + this.diagnoseTime = diagnoseTime; + } public List getHandlingSuggestion() { return handlingSuggestion;