Commit 7be7213ef43bb37714a42dac25a7ff5e034ed6e2
1 parent
3bf87ebf39
Exists in
master
and in
1 other branch
听力诊断模块
Showing 1 changed file with 10 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
View file @
7be7213
| ... | ... | @@ -74,20 +74,24 @@ |
| 74 | 74 | if (loginState == null) { |
| 75 | 75 | return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); |
| 76 | 76 | } |
| 77 | -//当前登录人医院Id | |
| 77 | + //当前登录人医院Id | |
| 78 | 78 | String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); |
| 79 | + | |
| 80 | + //儿童听筛记录 | |
| 79 | 81 | BabyPatientExtendEarScreenQuery earScreenQuery = new BabyPatientExtendEarScreenQuery(); |
| 80 | 82 | earScreenQuery.setBabyId(babyId); |
| 81 | - //儿童听筛记录 | |
| 82 | 83 | List<BabyPatientExtendEarScreen> earScreenList = screenService.queryBabyPatientExtendEarScreen(earScreenQuery); |
| 84 | + | |
| 85 | + //儿童听力诊断记录 | |
| 83 | 86 | BabyPatientExtendEarHearingDiagnoseQuery hearingDiagnoseQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); |
| 84 | 87 | hearingDiagnoseQuery.setBabyId(babyId); |
| 85 | 88 | hearingDiagnoseQuery.setIfdel(0); |
| 86 | - //儿童听力诊断记录 | |
| 87 | 89 | List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hearingDiagnoseQuery); |
| 90 | + | |
| 91 | + //儿童听力随访记录 | |
| 88 | 92 | BabyPatientExtendEarFollowUpQuery earFollowUpQuery = new BabyPatientExtendEarFollowUpQuery(); |
| 89 | 93 | earFollowUpQuery.setBabyId(babyId); |
| 90 | - //儿童听力随访记录 | |
| 94 | + earFollowUpQuery.setIfdel(0); | |
| 91 | 95 | List<BabyPatientExtendEarFollowUp> earFollowUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUpByBaby(earFollowUpQuery); |
| 92 | 96 | |
| 93 | 97 | List<Map<String,String>> resultList = new ArrayList<>(); |
| ... | ... | @@ -298,7 +302,7 @@ |
| 298 | 302 | if (loginState == null) { |
| 299 | 303 | return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); |
| 300 | 304 | } |
| 301 | -//当前登录人医院Id | |
| 305 | + //当前登录人医院Id | |
| 302 | 306 | String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); |
| 303 | 307 | |
| 304 | 308 | BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); |
| ... | ... | @@ -317,6 +321,7 @@ |
| 317 | 321 | } |
| 318 | 322 | //设置确诊 |
| 319 | 323 | query.setIsconfirm(1); |
| 324 | + query.setIfdel(0); | |
| 320 | 325 | if (hdReq.getConfirmDegree() != null) {//模糊查询确诊结果 |
| 321 | 326 | List<String> cfList = new ArrayList<>(); |
| 322 | 327 | if (hdReq.getConfirmDegree() == 1) {//轻度 |