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_ + + + and( + abr_left =1 + and abr_right = 1 + ) + + + and( + abr_left =-1 + and abr_right = -1 + ) + + + and( + abr_left is not null + or abr_right is not null + ) + + and( oae_left =1 and aabr_left = 1 + and abr_left = 1 ) and( oae_left =-1 and aabr_left = -1 + and abr_left = -1 ) and( oae_left is not null or aabr_left is not null + or abr_left is not null ) @@ -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 ) and( oae_right =-1 and aabr_right = -1 + and abr_right = -1 ) and( oae_right is not null or aabr_right is not null + or abr_right is not null )