diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java index c62a3e5..3d1a97f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java @@ -95,7 +95,10 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { * 听筛月龄 */ private String monthAge; - + /** + * 是否通过 1-通过 2-未通过 + */ + private Integer scrIspass; /** * 诊断时间 */ @@ -113,6 +116,14 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { private String lastUpdateHospitalId; private Integer status; + public Integer getScrIspass() { + return scrIspass; + } + + public void setScrIspass(Integer scrIspass) { + this.scrIspass = scrIspass; + } + public Date getNextCheckTime() { return nextCheckTime; } 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 2ffcba3..d0ef3d9 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 @@ -137,8 +137,18 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { //筛查技术 1-AOE 2-AABR private Integer srcSkill; + //筛查结果 1通过 2-未通过 + private Integer scrIspass; + public Integer getScrIspass() { + return scrIspass; + } + + public void setScrIspass(Integer scrIspass) { + this.scrIspass = scrIspass; + } + public Integer getSrcSkill() { return srcSkill; } 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 9252145..d46403d 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -36,12 +36,13 @@ + -insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,next_check_time,last_update_date,last_update_user_id,last_update_hospital_id,status) values (#{id},#{babyId},#{screenType},#{checkHospitalId},#{screenDate},#{highRiskCause},#{oaeLeft},#{oaeRight},#{aabrLeft},#{aabrRight},#{gjb2Del35},#{gjb2Del176},#{gjb2Del235},#{gjb2Del299},#{gjb3Slc26a4538},#{gjb3Slc26a42168},#{gjb3Slc26a4Ivs7},#{rrna1494},#{rrna1555},#{processOptionType},#{processOptionDesc},#{guidOpinion},#{checkDoctorId},#{referralDate},#{createDate},#{createUserId},#{createHospitalId},#{nextCheckTime},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{status}) +insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,next_check_time,last_update_date,last_update_user_id,last_update_hospital_id,status,scr_ispass) values (#{id},#{babyId},#{screenType},#{checkHospitalId},#{screenDate},#{highRiskCause},#{oaeLeft},#{oaeRight},#{aabrLeft},#{aabrRight},#{gjb2Del35},#{gjb2Del176},#{gjb2Del235},#{gjb2Del299},#{gjb3Slc26a4538},#{gjb3Slc26a42168},#{gjb3Slc26a4Ivs7},#{rrna1494},#{rrna1555},#{processOptionType},#{processOptionDesc},#{guidOpinion},#{checkDoctorId},#{referralDate},#{createDate},#{createUserId},#{createHospitalId},#{nextCheckTime},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{status},#{scrIspass}) @@ -142,6 +143,9 @@ insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospita status = #{status,jdbcType=INTEGER}, + + scrIspass = #{scr_ispass,jdbcType=INTEGER}, + where id = #{id,jdbcType=VARCHAR} @@ -154,7 +158,7 @@ delete from baby_patient_extend_ear_screen where id = #{id,jdbcType=VARCHAR} @@ -274,6 +278,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and status = #{status,jdbcType=INTEGER} + + and scr_ispass = #{scrIspass,jdbcType=INTEGER} + @@ -282,7 +289,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ select - id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status + id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass from baby_patient_extend_ear_screen status = 0 @@ -334,7 +341,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ ) - + and ( oae_left !=-1 and oae_right !=-1 @@ -342,7 +349,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and aabr_right !=-1 ) - + and( oae_left =-1 or oae_right = -1 @@ -351,19 +358,19 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ ) - + and( oae_left =1 and oae_right = 1 ) - + and( oae_left =-1 and oae_right = -1 ) - + and( oae_left is not null or oae_right is not null @@ -371,19 +378,19 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ - + and( aabr_left =1 and aabr_right = 1 ) - + and( aabr_left =-1 and aabr_right = -1 ) - + and( aabr_left is not null or aabr_right is not null @@ -393,19 +400,19 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ - + and( oae_left =1 and aabr_left = 1 ) - + and( oae_left =-1 and aabr_left = -1 ) - + and( oae_left is not null or aabr_left is not null @@ -414,19 +421,19 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ - + and( oae_right =1 and aabr_right = 1 ) - + and( oae_right =-1 and aabr_right = -1 ) - + and( oae_right is not null or aabr_right is not null @@ -454,7 +461,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ @@ -568,7 +578,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index a0e04f3..b370843 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1753,7 +1753,7 @@ public class BabyEarFacade { screenQuery.setSrcEndTime(earScreenListRequest.getSrcEndTime()); screenQuery.setCheckDoctorId(earScreenListRequest.getCheckDoctorId()); screenQuery.setScreenType(earScreenListRequest.getScreenType()); - screenQuery.setIsPass(earScreenListRequest.getIsPass()); + screenQuery.setScrIspass(earScreenListRequest.getIsPass()); screenQuery.setLeftRight(earScreenListRequest.getLeftRight()); screenQuery.setSrcSkill(earScreenListRequest.getSrcSkill()); screenQuery.setNextStartTime(earScreenListRequest.getNextStartTime()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java index 96c8ed0..6a7fa3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java @@ -83,6 +83,10 @@ public class BabyScreenAddRequest implements IBasicRequestConvert