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 90d6586..a31066c 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 @@ -374,7 +374,7 @@ public class BabyPatientExtendEarHearingDiagnose { */ private String assrRight4k; /** - * 诊断指导处理意见 + * 诊断指导处理意见 1-确诊纳入随访 2-未发现问题 */ private String diagnHandSugge; /** diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java index 3cf8abb..ec80b26 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java @@ -35,6 +35,17 @@ public class HdEnums { this.name = name; } } + public static String getHsTitle(int id) { + if (id == 0) { + return ""; + } + for (HandlingSuggestionEnums cfEnums : HandlingSuggestionEnums.values()) { + if (id == cfEnums.getId()) { + return cfEnums.getName(); + } + } + return ""; + } public enum IsConfirmEnums { BY(1, "已确诊"), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 74570ab..8a63549 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -383,13 +383,15 @@ public class FollowUpController extends BaseController { res.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); res.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); } - - Users user = usersService.getUsers(Integer.parseInt(fu.getFollowDoctorId())); - if (user != null) { - //设置随访医生名称 - res.setDoctorName(user.getName()); + if(StringUtils.isNotEmpty(fu.getFollowDoctorId())){ + Users user = usersService.getUsers(Integer.parseInt(fu.getFollowDoctorId())); + if (user != null) { + //设置随访医生名称 + res.setDoctorName(user.getName()); + } } + fuResult.add(res); } return FrontEndResult.ini().setData(fuResult).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); @@ -462,7 +464,10 @@ public class FollowUpController extends BaseController { obj.setModifyId(String.valueOf(loginState.getId())); obj.setModifyTime(new Date()); babyPatientExtendEarFollowUpService.updateBabyPatientExtendEarFollowUp(obj); - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); + BaseResponse response = new BaseResponse(); + response.setObject(obj.getId()); + + return response.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 4eb29ff..8cad016 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 @@ -6,10 +6,7 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.ConfirmedEnums; -import com.lyms.platform.common.enums.HearingDiagnosisEnums; -import com.lyms.platform.common.enums.HighRiskEnum; -import com.lyms.platform.common.enums.SexEnum; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; @@ -131,20 +128,20 @@ public class HearingDiagnoseController extends BaseController { behd.setIsconfirmStr(behd.getIsconfirm() == 1 ? "是" : "否"); } - if (behd.getConfirmTime() != null) {//计算儿童月龄 + if (behd.getDiagnoseTime() != null) {//计算儿童月龄 String babyId = behd.getBabyId(); //查询baby档案查询出生日期 BabyModel babyModel = babyService.getOneBabyById(babyId); if (babyModel != null) { //设置确诊时宝宝月龄 - String monthAget = DateUtil.getBabyMonthAge(babyModel.getBirth(), behd.getConfirmTime()); + String monthAget = DateUtil.getBabyMonthAge(babyModel.getBirth(), behd.getDiagnoseTime()); behd.setMonthAge(monthAget); } //设置确诊时间字符串 behd.setConfirmTimeStr(DateUtil.getyyyy_MM_dd(behd.getConfirmTime())); } - if (StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum + if (StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum { StringBuffer hfBuff = new StringBuffer(); String[] highFactors = behd.getHighFactor().split(","); @@ -196,6 +193,10 @@ public class HearingDiagnoseController extends BaseController { behd.setDiagnResultStr(hfBuff.toString()); } + if(StringUtils.isNotEmpty(behd.getDiagnHandSugge())){ + behd.setDiagnHandSugge(HdEnums.getHsTitle(Integer.parseInt(behd.getDiagnHandSugge()))); + } + BaseResponse result = new BaseResponse(); result.setObject(behd); result.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); @@ -419,7 +420,7 @@ public class HearingDiagnoseController extends BaseController { hea.setId(hd.getId()); hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())); String docotorId = hd.getDiagnDoctorId(); - Users users = usersService.getUsers(Integer.parseInt(docotorId)); + Users users = usersService.getUsers(Integer.parseInt(docotorId==null?"0":docotorId)); if (users != null) { hea.setDoctorName(users.getName() == null ? "-" : users.getName()); } @@ -461,6 +462,7 @@ public class HearingDiagnoseController extends BaseController { BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId()); if (babyModel != null) { hea.setBabyName(babyModel.getName()); + hea.setBabyId(hd.getBabyId()); hea.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname())); hea.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone())); hea.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone())); @@ -589,7 +591,9 @@ public class HearingDiagnoseController extends BaseController { obj.setModifyId(String.valueOf(loginState.getId())); obj.setModifyTime(new Date()); hearingDiagnoseService.updateBabyPatientExtendEarHearingDiagnose(obj); - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); + BaseResponse response = new BaseResponse(); + response.setObject(obj.getId()); + return response.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java index fc5d81a..364c531 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java @@ -7,6 +7,8 @@ package com.lyms.platform.operate.web.result; public class HearingDiagnoseListResult { //主键 private String id; + //儿童id + private String babyId; //儿童名称 private String babyName; //母亲姓名 @@ -34,6 +36,14 @@ public class HearingDiagnoseListResult { //听力高危集合 private String highRiskEnums; + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + public String getId() { return id; }