From f4c6ab11b767ff4e23cdaf6918094f7a274470a3 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 23 May 2017 18:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/BabyPatientExtendEarHearingDiagnose.java | 108 ++++++++++++++++++++- .../common/enums/HearingDiagnosisEnums.java | 2 +- .../web/controller/HearingDiagnoseController.java | 87 +++++++++++++++-- .../src/main/webapp/WEB-INF/web.xml | 4 +- 4 files changed, 186 insertions(+), 15 deletions(-) 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 7ee8ca6..f843f36 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 @@ -16,6 +16,8 @@ public class BabyPatientExtendEarHearingDiagnose { * 检测医院ID */ private String hospitalId; + + private String hospitalName; /** * 诊断时间 */ @@ -24,6 +26,10 @@ public class BabyPatientExtendEarHearingDiagnose { * 高危因素 */ private String highFactor; + /** + * 高危因素 + */ + private String highFactorStr; /** * ABR潜伏期左耳dBnHL @@ -318,10 +324,18 @@ public class BabyPatientExtendEarHearingDiagnose { */ private Integer aabrLeftIfPass; /** + * AABR左耳是否通过 0-未通过，1-通过 + */ + private String aabrLeftIfPassStr; + /** * AABR右耳是否通过 0-未通过，1-通过 */ private Integer aabrRightIfPass; /** + * AABR右耳是否通过 0-未通过，1-通过 + */ + private String aabrRightIfPassStr; + /** * ASSR左耳500Hz */ private String assrLeft500; @@ -366,6 +380,10 @@ public class BabyPatientExtendEarHearingDiagnose { */ private String diagnDoctorId; /** + * 诊断指导诊断医生 + */ + private String diagnDoctorStr; + /** * 预约下次诊断时间 */ private Date diagnNextTime; @@ -398,19 +416,89 @@ public class BabyPatientExtendEarHearingDiagnose { */ private Integer isconfirm; /** + * 是否确诊 0-未确诊 1-确诊 + */ + private String isconfirmStr; + /** * 诊断结果 */ private String diagnResult; - + /** + * 诊断结果 + */ + private String diagnResultStr; /** * 确诊结果 */ - private String confirmResult; /** + * 确诊结果 + */ + private String confirmResultStr; + /** * 确诊时间 */ private Date confirmTime; + /** + * 确诊时间 + */ + private String confirmTimeStr; + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public String getHighFactorStr() { + return highFactorStr; + } + + public void setHighFactorStr(String highFactorStr) { + this.highFactorStr = highFactorStr; + } + + public String getDiagnDoctorStr() { + return diagnDoctorStr; + } + + public void setDiagnDoctorStr(String diagnDoctorStr) { + this.diagnDoctorStr = diagnDoctorStr; + } + + public String getIsconfirmStr() { + return isconfirmStr; + } + + public void setIsconfirmStr(String isconfirmStr) { + this.isconfirmStr = isconfirmStr; + } + + public String getDiagnResultStr() { + return diagnResultStr; + } + + public void setDiagnResultStr(String diagnResultStr) { + this.diagnResultStr = diagnResultStr; + } + + public String getConfirmResultStr() { + return confirmResultStr; + } + + public void setConfirmResultStr(String confirmResultStr) { + this.confirmResultStr = confirmResultStr; + } + + public String getConfirmTimeStr() { + return confirmTimeStr; + } + + public void setConfirmTimeStr(String confirmTimeStr) { + this.confirmTimeStr = confirmTimeStr; + } public Date getConfirmTime() { return confirmTime; @@ -440,6 +528,22 @@ public class BabyPatientExtendEarHearingDiagnose { return hospitalId; } + public String getAabrLeftIfPassStr() { + return aabrLeftIfPassStr; + } + + public void setAabrLeftIfPassStr(String aabrLeftIfPassStr) { + this.aabrLeftIfPassStr = aabrLeftIfPassStr; + } + + public String getAabrRightIfPassStr() { + return aabrRightIfPassStr; + } + + public void setAabrRightIfPassStr(String aabrRightIfPassStr) { + this.aabrRightIfPassStr = aabrRightIfPassStr; + } + public void setHospitalId(String hospitalId) { this.hospitalId = hospitalId; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java index 9d546a8..f38285b 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java @@ -1,7 +1,7 @@ package com.lyms.platform.common.enums; /** - * 听力诊断结果 + * 听力诊断列表 * @auther yangfei * @createTime 2017年05月15日 17时41分 * @discription 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 64aedb0..ec01047 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,13 +1,13 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.annotation.TokenRequired; 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.result.BaseListResponse; @@ -18,10 +18,7 @@ import com.lyms.platform.operate.web.request.HearingDiagnoseRequest; import com.lyms.platform.operate.web.result.HearingDiagnoseListResult; import com.lyms.platform.operate.web.utils.MyComparator; import com.lyms.platform.permission.model.*; -import com.lyms.platform.permission.service.BabyPatientExtendEarHearingDiagnoseService; -import com.lyms.platform.permission.service.BabyPatientExtendEarScreenService; -import com.lyms.platform.permission.service.HighriskChangeHospitalService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +47,7 @@ public class HearingDiagnoseController extends BaseController { @Autowired private BabyService babyService; @Autowired - private BasicConfigService basicConfigService; + private OrganizationService organizationService; //转诊记录 @Autowired private HighriskChangeHospitalService highchangeService; @@ -70,6 +67,80 @@ public class HearingDiagnoseController extends BaseController { @ResponseBody public BaseResponse queryHearingDiagnoseOne(String hdId) { BabyPatientExtendEarHearingDiagnose behd = hearingDiagnoseService.getBabyPatientExtendEarHearingDiagnose(hdId); + if(hdId==null){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到对应的数据"); + } + + if(StringUtils.isNotEmpty(behd.getHospitalId())){//查询医院名称 + //判断ID是否存在 + Organization organization = organizationService.getOrganization(Integer.parseInt(behd.getHospitalId())); + if(organization!=null){ + String hospitalName = organization.getName(); + behd.setHospitalName(hospitalName); + } + } + if(StringUtils.isNotEmpty(behd.getDiagnDoctorId())){//查询医生名称 + Users users = usersService.getUsers(Integer.parseInt(behd.getDiagnDoctorId())); + if(users!=null){ + behd.setDiagnDoctorStr(users.getName() == null ? "-" : users.getName()); + } + } + if(behd.getConfirmTime()!=null){//计算儿童月龄 + String babyId = behd.getBabyId(); + //查询baby档案查询出生日期 + BabyModel babyModel = babyService.getOneBabyById(babyId); + if(babyModel!=null){ + DateUtil.getBabyMonthAge(babyModel.getBirth(),behd.getConfirmTime()); + } + behd.setConfirmTimeStr(DateUtil.getyyyy_MM_dd(behd.getConfirmTime())); + } + if(StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum + { + StringBuffer hfBuff = new StringBuffer(); + String [] highFactors = behd.getHighFactor().split(","); + for(String hf : highFactors){ + if(StringUtils.isNotEmpty(hf)){ + String name = HighRiskEnum.getTitle(Integer.parseInt(hf)); + hfBuff.append(name+"、"); + } + } + behd.setHighFactorStr(hfBuff.toString()); + } + + if(behd.getAabrLeftIfPass()!=null){//左耳是否通过 0-未通过，1-通过 + behd.setAabrLeftIfPassStr(behd.getAabrLeftIfPass()==0?"未通过":"通过"); + } + + if(behd.getAabrRightIfPass()!=null){//右耳耳是否通过 + behd.setAabrRightIfPassStr(behd.getAabrRightIfPass()==0?"未通过":"通过"); + } + + if(StringUtils.isNotEmpty(behd.getConfirmResult()))//确诊结果转换 ConfirmedEnums + { + StringBuffer hfBuff = new StringBuffer(); + String [] highFactors = behd.getConfirmResult().split(","); + for(String hf : highFactors){ + if(StringUtils.isNotEmpty(hf)){ + String name = ConfirmedEnums.getTitle(Integer.parseInt(hf)); + hfBuff.append(name+"、"); + } + } + behd.setConfirmResultStr(hfBuff.toString()); + } + + if(StringUtils.isNotEmpty(behd.getDiagnResult()))//诊断内容转换 HearingDiagnosisEnums + { + StringBuffer hfBuff = new StringBuffer(); + String [] highFactors = behd.getConfirmResult().split(","); + for(String hf : highFactors){ + if(StringUtils.isNotEmpty(hf)){ + String name = HearingDiagnosisEnums.getTitle(Integer.parseInt(hf)); + hfBuff.append(name+"、"); + } + } + behd.setDiagnResultStr(hfBuff.toString()); + } + BaseResponse result = new BaseResponse(); result.setObject(behd); result.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); @@ -230,13 +301,9 @@ public class HearingDiagnoseController extends BaseController { query.setDiagnNextEndTime(hdReq.getDiagnNextEndTime()); } - if (hdReq.getIsconfirm() != null) {//是否确诊 0-未确诊 1-确诊 query.setIsconfirm(hdReq.getIsconfirm()); } - - - if (hdReq.getConfirmDegree() != null) {//模糊查询确诊结果 List cfList = new ArrayList<>(); if (hdReq.getConfirmDegree() == 1) {//轻度 diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml index 8d78101..e85755a 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -13,7 +13,7 @@ version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - CorsFilter org.apache.catalina.filters.CorsFilter @@ -47,7 +47,7 @@ /* ---> + default -- 1.8.3.1