From 6358b71f6f3d98a474517c7225de2a8a87110ccb Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 26 Jul 2017 13:55:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E7=A7=91=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/BabyPatientExtendEarHearingDiagnose.xml | 2 +- .../common/enums/HearingDiagnosisEnums.java | 24 ++++++++++----- .../web/controller/HearingDiagnoseController.java | 36 +++++++++++++++++----- 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml index 09260e6..18900a6 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml @@ -841,7 +841,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ AND hd.isconfirm = #{isconfirm} - + and hd.confirm_result like concat("%",#{confirmResult},"%") diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java index f38285b..ed4bfef 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java @@ -7,21 +7,29 @@ package com.lyms.platform.common.enums; * @discription */ public enum HearingDiagnosisEnums { - DEQDGYSJXL(1,"单耳轻度感音神经性聋"), + DEQDGYSJXLZE(1,"单耳轻度感音神经性聋(左耳)"), + DEQDGYSJXLYE(17,"单耳轻度感音神经性聋（右耳）"), SEQDGYSJXL(2,"双耳轻度感音神经性聋"), - DEQDCDXLHBZEY(3,"单耳轻度传导性聋合并中耳炎"), + DEQDCDXLHBZEYZE(3,"单耳轻度传导性聋合并中耳炎(左耳)"), + DEQDCDXLHBZEYYE(18,"单耳轻度传导性聋合并中耳炎（右耳）"), SEQDCDXLHBZEY(4,"双耳轻度传导性聋合并中耳炎"), - DEZDGYSJXL(5,"单耳中度感音神经性聋"), + DEZDGYSJXLZE(5,"单耳中度感音神经性聋(左耳)"), + DEZDGYSJXLYE(19,"单耳中度感音神经性聋（右耳）"), SEZDGYSJXL(6,"双耳中度感音神经性聋"), - DEZDCDXLHBZEY(7,"单耳中度传导性聋合并中耳炎"), + DEZDCDXLHBZEYZE(7,"单耳中度传导性聋合并中耳炎(左耳)"), + DEZDCDXLHBZEYYE(20,"单耳中度传导性聋合并中耳炎（右耳）"), SEZDCDXLHBZEY(8,"双耳中度传导性聋合并中耳炎"), - DEZZDGYSJXL(9,"单耳中重度感音神经性聋"), + DEZZDGYSJXLZE(9,"单耳中重度感音神经性聋(左耳)"), + DEZZDGYSJXLYE(21,"单耳中重度感音神经性聋（右耳）"), SEZZDGYSJXL(10,"双耳中重度感音神经性聋"), - DEZZDCDXLHBZEY(11,"单耳中重度传导性聋合并中耳炎"), + DEZZDCDXLHBZEYZE(11,"单耳中重度传导性聋合并中耳炎(左耳)"), + DEZZDCDXLHBZEYYE(22,"单耳中重度传导性聋合并中耳炎（右耳）"), SEZZDCDXLHBZEY(12,"双耳中重度传导性聋合并中耳炎"), - DEZZGYSJXL(13,"单耳重度感音神经性聋"), + DEZZGYSJXLZE(13,"单耳重度感音神经性聋(左耳)"), + DEZZGYSJXLYE(23,"单耳重度感音神经性聋（右耳）"), SEZDGYSJXLS(14,"双耳重度感音神经性聋"), - DEJZDGYSJXL(15,"单耳极重度感音神经性聋"), + DEJZDGYSJXLZE(15,"单耳极重度感音神经性聋(左耳)"), + DEJZDGYSJXLYE(24,"单耳极重度感音神经性聋（右耳）"), SEJZDGYSJXL(16,"双耳极重度感音神经性聋"); private int id; private String name; 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 0b4339c..dba9ad0 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 @@ -349,10 +349,6 @@ public class HearingDiagnoseController extends BaseController { //设置要查询的babyId query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - if (hdReq.getConfirmResult() != null) { - query.setConfirmResult(String.valueOf(hdReq.getConfirmResult())); - } - if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间 query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime()); } @@ -377,7 +373,7 @@ public class HearingDiagnoseController extends BaseController { if (hdReq.getIsconfirm() != null) {//是否确诊 0-未确诊 1-确诊 query.setIsconfirm(hdReq.getIsconfirm()); } - if (hdReq.getConfirmDegree() != null) {//模糊查询确诊结果 + if (hdReq.getConfirmDegree() != null) {//模糊查询确诊程度 List cfList = new ArrayList<>(); if (hdReq.getConfirmDegree() == 1) {//轻度 cfList.add(",1,"); @@ -387,11 +383,10 @@ public class HearingDiagnoseController extends BaseController { cfList.add(",4,"); cfList.add(",5,"); cfList.add(",6,"); - } else if (hdReq.getConfirmDegree() == 3) {//重度 + } else if (hdReq.getConfirmDegree() == 3) {//中重度和重度 cfList.add(",7,"); cfList.add(",8,"); cfList.add(",9,"); - } else if (hdReq.getConfirmDegree() == 3) {//重度 cfList.add(",10,"); cfList.add(",11,"); cfList.add(",12,"); @@ -401,9 +396,34 @@ public class HearingDiagnoseController extends BaseController { cfList.add(",15,"); } query.setConfirmResults(cfList.toArray(new String[cfList.size()])); - // query.setConfirmResult("," + hdReq.getConfirmResult() + ","); } + if (hdReq.getConfirmResult() != null) { + List cfList = new ArrayList<>(); + if (hdReq.getConfirmResult() == 1) {//轻度 + cfList.add(",1,"); + cfList.add(",2,"); + cfList.add(",3,"); + } else if (hdReq.getConfirmResult() == 2) {//中度 + cfList.add(",4,"); + cfList.add(",5,"); + cfList.add(",6,"); + } else if (hdReq.getConfirmResult() == 3) {//中重度和重度 + cfList.add(",7,"); + cfList.add(",8,"); + cfList.add(",9,"); + cfList.add(",10,"); + cfList.add(",11,"); + cfList.add(",12,"); + } else if (hdReq.getConfirmResult() == 4) {//极重度 + cfList.add(",13,"); + cfList.add(",14,"); + cfList.add(",15,"); + } + query.setConfirmResults(cfList.toArray(new String[cfList.size()])); + } + + if (hdReq.getConfirmStartTime() != null) {//确诊开始时间 query.setConfirmStartTime(hdReq.getConfirmStartTime()); } -- 1.8.3.1