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