diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index 9fff6bd..19d1832 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -74,20 +74,24 @@ public class HearDiagnManageController extends BaseController { if (loginState == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } -//当前登录人医院Id + //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + + //儿童听筛记录 BabyPatientExtendEarScreenQuery earScreenQuery = new BabyPatientExtendEarScreenQuery(); earScreenQuery.setBabyId(babyId); - //儿童听筛记录 List earScreenList = screenService.queryBabyPatientExtendEarScreen(earScreenQuery); + + //儿童听力诊断记录 BabyPatientExtendEarHearingDiagnoseQuery hearingDiagnoseQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); hearingDiagnoseQuery.setBabyId(babyId); hearingDiagnoseQuery.setIfdel(0); - //儿童听力诊断记录 List hearingDiagnoseList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hearingDiagnoseQuery); + + //儿童听力随访记录 BabyPatientExtendEarFollowUpQuery earFollowUpQuery = new BabyPatientExtendEarFollowUpQuery(); earFollowUpQuery.setBabyId(babyId); - //儿童听力随访记录 + earFollowUpQuery.setIfdel(0); List earFollowUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUpByBaby(earFollowUpQuery); List> resultList = new ArrayList<>(); @@ -298,7 +302,7 @@ public class HearDiagnManageController extends BaseController { if (loginState == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } -//当前登录人医院Id + //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); @@ -317,6 +321,7 @@ public class HearDiagnManageController extends BaseController { } //设置确诊 query.setIsconfirm(1); + query.setIfdel(0); if (hdReq.getConfirmDegree() != null) {//模糊查询确诊结果 List cfList = new ArrayList<>(); if (hdReq.getConfirmDegree() == 1) {//轻度