From aeee6d35f81003856334a1faa85b3baf70867277 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 30 Aug 2017 11:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/EarController.java | 30 +++++++--------------- 1 file changed, 9 insertions(+), 21 deletions(-) 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 22945ce..6b08fd2 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 @@ -134,9 +134,10 @@ public class EarController extends BaseController { } } initHearingDiagnose.setConfirmResult(confiArr); - initHearingDiagnose.setConfirmData(DateUtil.getyyyy_MM_dd(hd.getConfirmTime())); - isConfirm = true; } + initHearingDiagnose.setConfirmData(DateUtil.getyyyy_MM_dd(hd.getConfirmTime())); + isConfirm = true; + break; } } if (!isConfirm) {// //若没有听诊记录或所有听诊记录都未确诊。提示：该儿童还未听力确诊，不能进行随访。 @@ -307,20 +308,7 @@ public class EarController extends BaseController { } else { boolean isResu = false; for (BabyPatientExtendEarScreen scr : screenList) { - if (scr.getOaeRight() == null) { - scr.setOaeRight(1); - } - if (scr.getOaeLeft() == null) { - scr.setOaeLeft(1); - } - if (scr.getAabrLeft() == null) { - scr.setAabrLeft(1); - } - if (scr.getAabrRight() == null) { - scr.setAabrRight(1); - } - //只要有听筛未通过的就可以进入听诊了 - if (scr.getOaeLeft() == -1 || scr.getOaeRight() == -1 || scr.getAabrLeft() == -1 || scr.getAabrRight() == -1) {//1=通过 -1=未通过 + if(scr.getScrIspass()==2&&scr.getScreenType()==2){//是复筛并且未通过 isResu = true; break; } @@ -332,11 +320,11 @@ public class EarController extends BaseController { //根据条件查询基础配置信息表 InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); - initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); - - initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); - - initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); + // initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class)); + // + // initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class)); + // + // initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class)); return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } -- 1.8.3.1