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 af296d2..8b242c0 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 @@ -20,6 +20,7 @@ import com.lyms.platform.operate.web.utils.MyComparator; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -58,6 +59,42 @@ public class HearingDiagnoseController extends BaseController { private UsersService usersService; /** + * 根据儿童id获取最后一次确诊结果 + * + * @param babyId + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryLastHearingDiagnose") + @ResponseBody + public BaseResponse queryLastHearingDiagnose(String babyId) { + BaseResponse response = new BaseResponse(); + BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); + query.setBabyId(babyId); + query.setSort("confirm_time"); + + List babyPatientExtendEarHearingDiagnoses = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(query); + Map result = new HashMap<>(); + result.put("confirmResultStr", ""); + result.put("confirmResult", ""); + + if (CollectionUtils.isNotEmpty(babyPatientExtendEarHearingDiagnoses)) { + BabyPatientExtendEarHearingDiagnose extendEarHearingDiagnose = babyPatientExtendEarHearingDiagnoses.get(0); + StringBuffer hfBuff = new StringBuffer(); + String[] highFactors = extendEarHearingDiagnose.getConfirmResult().split(","); + for (String hf : highFactors) { + if (StringUtils.isNotEmpty(hf)) { + String name = ConfirmedEnums.getTitle(Integer.parseInt(hf)); + hfBuff.append(name + "、"); + } + } + result.put("confirmResultStr", hfBuff.toString()); + result.put("confirmResult", extendEarHearingDiagnose.getConfirmResult()); + } + response.setObject(result); + return response; + } + + /** * 根据id获取听力诊断记录信息 * * @param hdId 听力诊断记录id @@ -67,7 +104,7 @@ public class HearingDiagnoseController extends BaseController { @ResponseBody public BaseResponse queryHearingDiagnoseOne(String hdId) { BabyPatientExtendEarHearingDiagnose behd = hearingDiagnoseService.getBabyPatientExtendEarHearingDiagnose(hdId); - if (hdId == null) { + if (behd == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到对应的数据"); } @@ -80,7 +117,7 @@ public class HearingDiagnoseController extends BaseController { behd.setHospitalName(hospitalName); } } - if(behd.getDiagnNextTime()!=null){ + if (behd.getDiagnNextTime() != null) { behd.setDiagnNextTimeStr(DateUtil.getyyyy_MM_dd(behd.getDiagnNextTime())); } if (StringUtils.isNotEmpty(behd.getDiagnDoctorId())) {//查询医生名称 @@ -90,8 +127,8 @@ public class HearingDiagnoseController extends BaseController { } } - if(behd.getIsconfirm()!=null){ - behd.setIsconfirmStr(behd.getIsconfirm()==1?"是":"否"); + if (behd.getIsconfirm() != null) { + behd.setIsconfirmStr(behd.getIsconfirm() == 1 ? "是" : "否"); } if (behd.getConfirmTime() != null) {//计算儿童月龄