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 f843f36..9472f4a 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 @@ -23,6 +23,10 @@ public class BabyPatientExtendEarHearingDiagnose { */ private Date diagnoseTime; /** + * 诊断时间 + */ + private String diagnoseTimeStr; + /** * 高危因素 */ private String highFactor; @@ -444,6 +448,14 @@ public class BabyPatientExtendEarHearingDiagnose { */ private String confirmTimeStr; + public String getDiagnoseTimeStr() { + return diagnoseTimeStr; + } + + public void setDiagnoseTimeStr(String diagnoseTimeStr) { + this.diagnoseTimeStr = diagnoseTimeStr; + } + public String getHospitalName() { return hospitalName; } 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 1d8896b..efe6a57 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 @@ -5,6 +5,7 @@ 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.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.ConfirmedEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AutoMatchFacade; @@ -144,13 +145,35 @@ public class FollowUpController extends BaseController { if (mb != null) {//没有找打儿童档案信息 res.setBabyName(mb.getName()); res.setMommyName(mb.getMname()); + //根据诊断时间获取月龄 res.setMonthAge(DateUtil.getBabyMonthAge(mb.getBirth(), new Date())); + res.setBirthday(DateUtil.getyyyy_MM_dd(mb.getBirth())); res.setSex(mb.getSex() == 0 ? "女" : mb.getSex() == 1 ? "男" : "未知"); - res.setMommnyPhone(mb.getMname()); + res.setMommnyPhone(mb.getMphone()); + res.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(mb.getMphone())); + } + + if (fu.getMarkResult() != null) { + String cr[] = fu.getMarkResult().split(","); + List> hdEnums = new ArrayList<>(); + for (int b = 0; b < cr.length; b++) { + if (StringUtils.isNotEmpty(cr[b])) { + Map map = new HashMap<>(); + String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); + map.put(Integer.parseInt(cr[b]), title); + hdEnums.add(map); + } + } + //设置确诊结果 + res.setDiagnResult(hdEnums); + } + + // res.setfollowTimeStr + + if(res.getIsColse()!=null){ + res.setIsColse(fu.getIfclose() == 1 ? "结案" : "未结案"); } - res.setDiagnose(fu.getMarkResult()); - res.setIsColse(fu.getIfclose() == 1 ? "结案" : "未结案"); Users user = usersService.getUsers(Integer.parseInt(fu.getFollowDoctorId())); if (user != null) { res.setDoctorName(user.getName()); 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 ec01047..489a5eb 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 @@ -67,75 +67,83 @@ public class HearingDiagnoseController extends BaseController { @ResponseBody public BaseResponse queryHearingDiagnoseOne(String hdId) { BabyPatientExtendEarHearingDiagnose behd = hearingDiagnoseService.getBabyPatientExtendEarHearingDiagnose(hdId); - if(hdId==null){ + if (hdId == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到对应的数据"); } - if(StringUtils.isNotEmpty(behd.getHospitalId())){//查询医院名称 + if (StringUtils.isNotEmpty(behd.getHospitalId())) {//查询医院名称 //判断ID是否存在 Organization organization = organizationService.getOrganization(Integer.parseInt(behd.getHospitalId())); - if(organization!=null){ + if (organization != null) { String hospitalName = organization.getName(); + //设置医院名称 behd.setHospitalName(hospitalName); } } - if(StringUtils.isNotEmpty(behd.getDiagnDoctorId())){//查询医生名称 + if (StringUtils.isNotEmpty(behd.getDiagnDoctorId())) {//查询医生名称 Users users = usersService.getUsers(Integer.parseInt(behd.getDiagnDoctorId())); - if(users!=null){ + if (users != null) { behd.setDiagnDoctorStr(users.getName() == null ? "-" : users.getName()); } } - if(behd.getConfirmTime()!=null){//计算儿童月龄 + if (behd.getConfirmTime() != null) {//计算儿童月龄 String babyId = behd.getBabyId(); //查询baby档案查询出生日期 BabyModel babyModel = babyService.getOneBabyById(babyId); - if(babyModel!=null){ - DateUtil.getBabyMonthAge(babyModel.getBirth(),behd.getConfirmTime()); + if (babyModel != null) { + //设置确诊时宝宝月龄 + DateUtil.getBabyMonthAge(babyModel.getBirth(), behd.getConfirmTime()); } + //设置确诊时间字符串 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(","); - for(String hf : highFactors){ - if(StringUtils.isNotEmpty(hf)){ + String[] highFactors = behd.getHighFactor().split(","); + for (String hf : highFactors) { + if (StringUtils.isNotEmpty(hf)) { String name = HighRiskEnum.getTitle(Integer.parseInt(hf)); - hfBuff.append(name+"、"); + hfBuff.append(name + "、"); } } behd.setHighFactorStr(hfBuff.toString()); } - if(behd.getAabrLeftIfPass()!=null){//左耳是否通过 0-未通过，1-通过 - behd.setAabrLeftIfPassStr(behd.getAabrLeftIfPass()==0?"未通过":"通过"); + if (behd.getDiagnoseTime() != null) { + //设置诊断字符串 + behd.setDiagnoseTimeStr(DateUtil.getyyyy_MM_dd(behd.getDiagnoseTime())); + } + + if (behd.getAabrLeftIfPass() != null) {//左耳是否通过 0-未通过，1-通过 + behd.setAabrLeftIfPassStr(behd.getAabrLeftIfPass() == 0 ? "未通过" : "通过"); } - if(behd.getAabrRightIfPass()!=null){//右耳耳是否通过 - behd.setAabrRightIfPassStr(behd.getAabrRightIfPass()==0?"未通过":"通过"); + if (behd.getAabrRightIfPass() != null) {//右耳耳是否通过 + behd.setAabrRightIfPassStr(behd.getAabrRightIfPass() == 0 ? "未通过" : "通过"); } - if(StringUtils.isNotEmpty(behd.getConfirmResult()))//确诊结果转换 ConfirmedEnums + if (StringUtils.isNotEmpty(behd.getConfirmResult()))//确诊结果转换 ConfirmedEnums { StringBuffer hfBuff = new StringBuffer(); - String [] highFactors = behd.getConfirmResult().split(","); - for(String hf : highFactors){ - if(StringUtils.isNotEmpty(hf)){ + String[] highFactors = behd.getConfirmResult().split(","); + for (String hf : highFactors) { + if (StringUtils.isNotEmpty(hf)) { String name = ConfirmedEnums.getTitle(Integer.parseInt(hf)); - hfBuff.append(name+"、"); + hfBuff.append(name + "、"); } } behd.setConfirmResultStr(hfBuff.toString()); } - if(StringUtils.isNotEmpty(behd.getDiagnResult()))//诊断内容转换 HearingDiagnosisEnums + if (StringUtils.isNotEmpty(behd.getDiagnResult()))//诊断内容转换 HearingDiagnosisEnums { StringBuffer hfBuff = new StringBuffer(); - String [] highFactors = behd.getConfirmResult().split(","); - for(String hf : highFactors){ - if(StringUtils.isNotEmpty(hf)){ + String[] highFactors = behd.getConfirmResult().split(","); + for (String hf : highFactors) { + if (StringUtils.isNotEmpty(hf)) { String name = HearingDiagnosisEnums.getTitle(Integer.parseInt(hf)); - hfBuff.append(name+"、"); + hfBuff.append(name + "、"); } } behd.setDiagnResultStr(hfBuff.toString()); @@ -148,7 +156,7 @@ public class HearingDiagnoseController extends BaseController { } /** - * 根据id获取听力诊断记录信息 + * 根据id获取听力诊断记录信息列表 * * @param babyId 儿童档案id * @return @@ -199,7 +207,7 @@ public class HearingDiagnoseController extends BaseController { /** * 获取听力诊断记录列表 * - * @param hdReq 听力诊断记录对象 + * @param hdReq 听力诊断记录对象 多条件查询 * @param request * @return */ @@ -276,7 +284,7 @@ public class HearingDiagnoseController extends BaseController { //设置要查询的babyId query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - if(hdReq.getConfirmResult()!=null){ + if (hdReq.getConfirmResult() != null) { query.setConfirmResult(String.valueOf(hdReq.getConfirmResult())); } @@ -402,14 +410,14 @@ public class HearingDiagnoseController extends BaseController { hea.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); } //诊断结果，肯定是有诊断记录 - if(hdReq.getConfirmResult()!=null||hdReq.getConfirmDegree()!=null){ + if (hdReq.getConfirmResult() != null || hdReq.getConfirmDegree() != null) { // 1、已诊断、2、待诊断、0、全部 if (StringUtils.isNotEmpty(hea.getId())) {//1、已诊断 confiList.add(hea); //全部 hdrList.add(hea); } - }else{ + } else { // 1、已诊断、2、待诊断、0、全部 if (StringUtils.isEmpty(hea.getId())) { waitConfiList.add(hea); @@ -424,8 +432,7 @@ public class HearingDiagnoseController extends BaseController { BaseListResponse result = new BaseListResponse(); PageInfo pageInfo = new PageInfo(); List resList = new ArrayList<>(); - if (hdReq.getEnalble() != null) - { + if (hdReq.getEnalble() != null) { if (hdReq.getEnalble() == 1) { for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < confiList.size() && i < hdReq.getLimit()); i++) { resList.add(confiList.get(i)); @@ -445,8 +452,7 @@ public class HearingDiagnoseController extends BaseController { pageInfo.setCount(hdrList.size()); result.setData(hdrList); } - } else - { + } else { for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); (i < hdrList.size() && i < hdReq.getLimit()); i++) { resList.add(hdrList.get(i)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java index 1262a17..bff71fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpListResult.java @@ -1,5 +1,8 @@ package com.lyms.platform.operate.web.result; +import java.util.List; +import java.util.Map; + /** * 随访管理列表 * Created by yf on 2017/5/11. @@ -16,17 +19,27 @@ public class FollowUpListResult { //出生日期 private String birthday; //诊断时间 --待确认 - private String hdTime; + private String followTimeStr; //性别 0-女，1-男 private String sex; - //确诊结果 - private String diagnose; + //诊断结果 + private List> diagnResult; //是否结案 private String isColse; //随访医生名称 private String doctorName; //母亲联系方式 private String mommnyPhone; + //母亲加密联系方式 + private String mommnyEncryptPhone; + + public String getMommnyEncryptPhone() { + return mommnyEncryptPhone; + } + + public void setMommnyEncryptPhone(String mommnyEncryptPhone) { + this.mommnyEncryptPhone = mommnyEncryptPhone; + } public String getId() { return id; @@ -68,12 +81,12 @@ public class FollowUpListResult { this.birthday = birthday; } - public String getHdTime() { - return hdTime; + public String getFollowTimeStr() { + return followTimeStr; } - public void setHdTime(String hdTime) { - this.hdTime = hdTime; + public void setFollowTimeStr(String followTimeStr) { + this.followTimeStr = followTimeStr; } public String getSex() { @@ -84,12 +97,12 @@ public class FollowUpListResult { this.sex = sex; } - public String getDiagnose() { - return diagnose; + public List> getDiagnResult() { + return diagnResult; } - public void setDiagnose(String diagnose) { - this.diagnose = diagnose; + public void setDiagnResult(List> diagnResult) { + this.diagnResult = diagnResult; } public String getIsColse() { 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 e85755a..56c6462 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -14,6 +14,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> +