diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml index 78cfcd3..2effd5b 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml index fa06e3d..5a8d58d 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -299,7 +299,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ ) - /*根据儿童id进行查询*/ + and sc.baby_id in ( 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 0e8b56e..3cf8abb 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 @@ -7,6 +7,35 @@ package com.lyms.platform.common.enums; */ public class HdEnums { + public enum HandlingSuggestionEnums { + QZNRSF(1, "确诊纳入随访"), + WFXWT(2, "未发现问题"); + + private int id; + private String name; + + HandlingSuggestionEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + public enum IsConfirmEnums { BY(1, "已确诊"), WY(2, "待确诊"); 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 7619fbc..d72df61 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 @@ -138,7 +138,7 @@ public class EarController extends BaseController { } /** - * 随访模块列表管理初始化数据 + * 听力诊断列表管理初始化数据 * * @return */ @@ -163,8 +163,32 @@ public class EarController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") @ResponseBody + public BaseResponse initHearingDiagnose() { + + //根据条件查询基础配置信息表 + InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); + initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); + initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); + initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); + initHearingDiagnose.setHandlingSuggestion(EnumUtil.toJson(HdEnums.HandlingSuggestionEnums.class)); + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + + /** + * 进入新增听力诊断页面前，验证及初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/checkHearingDiagnose") + @ResponseBody @TokenRequired - public BaseResponse initHearingDiagnose(String babyId, HttpServletRequest request) { + public BaseResponse checkHearingDiagnose(String babyId, HttpServletRequest request) { + //开发--跳过验证 + if(StringUtils.isNotEmpty(babyId)){ + //根据条件查询基础配置信息表 + InitFollowUp aa = new InitFollowUp(); + return aa.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } //获取当前登录用户ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); if (loginState == null) { @@ -197,11 +221,11 @@ public class EarController extends BaseController { if(scr.getOaeRight()==null||scr.getOaeLeft()==null||scr.getAabrLeft()==null||scr.getAabrRight()==null){ }else - //只要有听筛未通过的就可以进入听诊了 - if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 - isResu = true; - break; - } + //只要有听筛未通过的就可以进入听诊了 + if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 + isResu = true; + break; + } } if (!isResu) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).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 8b242c0..af012a1 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 @@ -317,12 +317,15 @@ public class HearingDiagnoseController extends BaseController { } scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()])); + if(scrQuery.getCheckHospitalIds()==null||scrQuery.getCheckHospitalIds().length==0){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); + } //主数据 List babyIds = screenService.queryScrBabyIds(scrQuery); if (babyIds.size() == 0) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到数据"); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } //设置要显示的医院集合（已加入条件本院、外院、全部） @@ -407,6 +410,9 @@ public class HearingDiagnoseController extends BaseController { hd.setBabyId(babyIds.get(i)); int index1 = Collections.binarySearch(hearingDiagnoseList, hd, new MyComparator()); HearingDiagnoseListResult hea = new HearingDiagnoseListResult(); + if (index1 < 0) { + continue; + } if (index1 >= 0) { hd = hearingDiagnoseList.get(index1); hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊"); @@ -420,30 +426,36 @@ public class HearingDiagnoseController extends BaseController { hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()))); if (hd.getHighFactor() != null) { String hf[] = hd.getHighFactor().split(","); - List> highRiskEnums = new ArrayList<>(); + // List> highRiskEnums = new ArrayList<>(); + StringBuffer hrSb = new StringBuffer(); for (int b = 0; b < hf.length; b++) { if (StringUtils.isNotEmpty(hf[b])) { Map map = new HashMap<>(); String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b])); map.put(Integer.parseInt(hf[b]), title); - highRiskEnums.add(map); + // highRiskEnums.add(map); + hrSb.append(title+","); } } - hea.setHighRiskEnums(highRiskEnums); + // hea.setHighRiskEnums(highRiskEnums); + hea.setHighRiskEnums(hrSb.toString()); } //确诊结果 if (hd.getConfirmResult() != null) { String cr[] = hd.getConfirmResult().split(","); - List> hdEnums = new ArrayList<>(); + // List> hdEnums = new ArrayList<>(); + StringBuffer hdSb = new StringBuffer(); 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); + // hdEnums.add(map); + hdSb.append(title+"，"); } } - hea.setDiagnResult(hdEnums); + // hea.setDiagnResult(hdEnums); + hea.setDiagnResult(hdSb.toString()); } } BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId()); @@ -588,6 +600,7 @@ public class HearingDiagnoseController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/saveHearingDiagnose") @ResponseBody + @TokenRequired public BaseResponse addHearingDiagnose(BabyPatientExtendEarHearingDiagnose obj, HttpServletRequest request) { //获取当前登录用户ID 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 ce2ad0f..fc5d81a 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 @@ -1,8 +1,5 @@ package com.lyms.platform.operate.web.result; -import java.util.List; -import java.util.Map; - /** * 听力诊断列表 * Created by yf on 2017/5/11. @@ -23,7 +20,7 @@ public class HearingDiagnoseListResult { //性别 private String sex; //诊断结果 - private List> diagnResult; + private String diagnResult; //是否确诊 0-待确诊，1-确诊 private String isconfirm; //创建时间 @@ -35,15 +32,7 @@ public class HearingDiagnoseListResult { //母亲加密联系方式 private String mommnyEncryptPhone; //听力高危集合 - private List> highRiskEnums; - - public List> getHighRiskEnums() { - return highRiskEnums; - } - - public void setHighRiskEnums(List> highRiskEnums) { - this.highRiskEnums = highRiskEnums; - } + private String highRiskEnums; public String getId() { return id; @@ -81,6 +70,18 @@ public class HearingDiagnoseListResult { return birthday; } + public void setDiagnResult(String diagnResult) { + this.diagnResult = diagnResult; + } + + public String getHighRiskEnums() { + return highRiskEnums; + } + + public void setHighRiskEnums(String highRiskEnums) { + this.highRiskEnums = highRiskEnums; + } + public void setBirthday(String birthday) { this.birthday = birthday; } @@ -101,19 +102,14 @@ public class HearingDiagnoseListResult { this.sex = sex; } - - public List> getDiagnResult() { - return diagnResult; - } - - public void setDiagnResult(List> diagnResult) { - this.diagnResult = diagnResult; - } - public String getIsconfirm() { return isconfirm; } + public String getDiagnResult() { + return diagnResult; + } + public void setIsconfirm(String isconfirm) { this.isconfirm = isconfirm; } 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 78bea5d..f5d38df 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 @@ -17,6 +17,16 @@ public class InitHearingDiagnose extends BaseResponse{ private List> hearingDiagnosis; //确诊结果 private List> confirmResult; + //处理意见 + private List> handlingSuggestion; + + public List> getHandlingSuggestion() { + return handlingSuggestion; + } + + public void setHandlingSuggestion(List> handlingSuggestion) { + this.handlingSuggestion = handlingSuggestion; + } public List> getHighRiskConfirms() { return highRiskConfirms; diff --git a/platform-operate-api/src/main/resources/rebel.xml b/platform-operate-api/src/main/resources/rebel.xml index 149fd02..c7f59fb 100644 --- a/platform-operate-api/src/main/resources/rebel.xml +++ b/platform-operate-api/src/main/resources/rebel.xml @@ -2,13 +2,13 @@ - + - + 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 9cdd433..223f552 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"> -