From 3d0a0d0bb42218dfd95af5e49a311c2eb32d0c44 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 6 Nov 2017 15:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=90=AC=E7=AD=9B=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/BabyPatientExtendEarScreenQuery.java     |  2 +-
 .../mainOrm/master/BabyPatientExtendEarScreen.xml  | 26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
index c5e757d..4d774a0 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
@@ -142,7 +142,7 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery {
     private Integer isPass;
     //耳别 1-左耳、2-右耳
     private Integer leftRight;
-    //筛查技术 1-AOE 2-AABR
+    //筛查技术 1-AOE 2-AABR 3-ABR\IA
     private Integer srcSkill;
 
     //筛查结果 1通过 2-未通过
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
index e511de5..3cafd0c 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
@@ -410,24 +410,47 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
                 </if>
 
             </if>
+            <if test="srcSkill != null and srcSkill == 3">
+                <if test="scrIspass != null and scrIspass ==1">
+                    and(
+                    abr_left =1
+                    and abr_right = 1
+                    )
+                </if>
+                <if test="scrIspass != null and scrIspass ==2">
+                    and(
+                    abr_left =-1
+                    and abr_right = -1
+                    )
+                </if>
+                <if test="scrIspass == null">
+                    and(
+                    abr_left is not null
+                    or abr_right is not null
+                    )
+                </if>
+            </if>
 
             <if test="leftRight!= null and leftRight == 1">
                 <if test="scrIspass != null and scrIspass ==1">
                     and(
                     oae_left =1
                     and aabr_left = 1
+                    and abr_left = 1
                     )
                 </if>
                 <if test="scrIspass != null and scrIspass ==2">
                     and(
                     oae_left =-1
                     and aabr_left = -1
+                    and abr_left = -1
                     )
                 </if>
                 <if test="scrIspass == null">
                     and(
                     oae_left is not null
                     or aabr_left is not null
+                    or abr_left is not null
                     )
                 </if>
             </if>
@@ -437,18 +460,21 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_
                     and(
                     oae_right =1
                     and aabr_right = 1
+                    and abr_right = 1
                     )
                 </if>
                 <if test="scrIspass != null and scrIspass ==2">
                     and(
                     oae_right =-1
                     and aabr_right = -1
+                    and abr_right = -1
                     )
                 </if>
                 <if test="scrIspass == null">
                     and(
                     oae_right is not null
                     or aabr_right is not null
+                    or abr_right is not null
                     )
                 </if>
 
-- 
1.8.3.1