Commit aeee6d35f81003856334a1faa85b3baf70867277
1 parent
9a8c5528c1
Exists in
master
and in
6 other branches
听力诊断模块
Showing 1 changed file with 9 additions and 21 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
View file @
aeee6d3
| ... | ... | @@ -134,9 +134,10 @@ |
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | initHearingDiagnose.setConfirmResult(confiArr); |
| 137 | - initHearingDiagnose.setConfirmData(DateUtil.getyyyy_MM_dd(hd.getConfirmTime())); | |
| 138 | - isConfirm = true; | |
| 139 | 137 | } |
| 138 | + initHearingDiagnose.setConfirmData(DateUtil.getyyyy_MM_dd(hd.getConfirmTime())); | |
| 139 | + isConfirm = true; | |
| 140 | + break; | |
| 140 | 141 | } |
| 141 | 142 | } |
| 142 | 143 | if (!isConfirm) {// //若没有听诊记录或所有听诊记录都未确诊。提示：该儿童还未听力确诊，不能进行随访。 |
| ... | ... | @@ -307,20 +308,7 @@ |
| 307 | 308 | } else { |
| 308 | 309 | boolean isResu = false; |
| 309 | 310 | for (BabyPatientExtendEarScreen scr : screenList) { |
| 310 | - if (scr.getOaeRight() == null) { | |
| 311 | - scr.setOaeRight(1); | |
| 312 | - } | |
| 313 | - if (scr.getOaeLeft() == null) { | |
| 314 | - scr.setOaeLeft(1); | |
| 315 | - } | |
| 316 | - if (scr.getAabrLeft() == null) { | |
| 317 | - scr.setAabrLeft(1); | |
| 318 | - } | |
| 319 | - if (scr.getAabrRight() == null) { | |
| 320 | - scr.setAabrRight(1); | |
| 321 | - } | |
| 322 | - //只要有听筛未通过的就可以进入听诊了 | |
| 323 | - if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 | |
| 311 | + if(scr.getScrIspass()==2&&scr.getScreenType()==2){//是复筛并且未通过 | |
| 324 | 312 | isResu = true; |
| 325 | 313 | break; |
| 326 | 314 | } |
| ... | ... | @@ -332,11 +320,11 @@ |
| 332 | 320 | |
| 333 | 321 | //根据条件查询基础配置信息表 |
| 334 | 322 | InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); |
| 335 | - initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); | |
| 336 | - | |
| 337 | - initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); | |
| 338 | - | |
| 339 | - initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); | |
| 323 | + // initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); | |
| 324 | + // | |
| 325 | + // initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); | |
| 326 | + // | |
| 327 | + // initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); | |
| 340 | 328 | |
| 341 | 329 | return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); |
| 342 | 330 | } |