From 6b98405b66b9d2fb23b2cfabafb3e32e2153fb1d Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 6 Nov 2017 14:59:53 +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/BabyPatientExtendEarScreen.java | 25 ++ .../model/BabyPatientExtendEarScreenQuery.java | 25 +- .../mainOrm/master/BabyPatientExtendEarScreen.xml | 251 +++++++++++---------- .../platform/operate/web/facade/BabyEarFacade.java | 4 + .../operate/web/request/BabyScreenAddRequest.java | 26 +++ 5 files changed, 215 insertions(+), 116 deletions(-) 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 913e7ea..4c48370 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 @@ -50,6 +50,15 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { */ private Integer aabrRight; + /** + * 左耳检查结果 1=通过 -1=未通过 + */ + private Integer abrLeft; + /** + * 右耳检查结果 1=通过 -1=未通过 + */ + private Integer abrRight; + /** * 听力基因GJB2-35 del G 的值 1=野生型 @@ -207,6 +216,22 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { this.createHospitalId = createHospitalId; } + public Integer getAbrLeft() { + return abrLeft; + } + + public void setAbrLeft(Integer abrLeft) { + this.abrLeft = abrLeft; + } + + public Integer getAbrRight() { + return abrRight; + } + + public void setAbrRight(Integer abrRight) { + this.abrRight = abrRight; + } + public Date getLastUpdateDate() { return lastUpdateDate; } 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 b57d176..c5e757d 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 @@ -64,7 +64,14 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { * 右耳检查结果 1=通过 -1=未通过 */ private Integer aabrRight; - + /** + * 左耳检查结果 1=通过 -1=未通过 + */ + private Integer abrLeft; + /** + * 右耳检查结果 1=通过 -1=未通过 + */ + private Integer abrRight; /** * 听力基因GJB2-35 del G 的值 1=野生型 @@ -141,6 +148,22 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { //筛查结果 1通过 2-未通过 private Integer scrIspass; + public Integer getAbrLeft() { + return abrLeft; + } + + public void setAbrLeft(Integer abrLeft) { + this.abrLeft = abrLeft; + } + + public Integer getAbrRight() { + return abrRight; + } + + public void setAbrRight(Integer abrRight) { + this.abrRight = abrRight; + } + public String getPid() { return pid; } 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 780df07..e511de5 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -14,6 +14,8 @@ + + @@ -38,12 +40,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,scr_ispass,pid) 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},#{pid}) +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,abr_left,abr_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,pid) values (#{id},#{babyId},#{screenType},#{checkHospitalId},#{screenDate},#{highRiskCause},#{oaeLeft},#{oaeRight},#{aabrLeft},#{aabrRight},#{abrLeft},#{abrRight},#{gjb2Del35},#{gjb2Del176},#{gjb2Del235},#{gjb2Del299},#{gjb3Slc26a4538},#{gjb3Slc26a42168},#{gjb3Slc26a4Ivs7},#{rrna1494},#{rrna1555},#{processOptionType},#{processOptionDesc},#{guidOpinion},#{checkDoctorId},#{referralDate},#{createDate},#{createUserId},#{createHospitalId},#{nextCheckTime},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{status},#{scrIspass},#{pid}) @@ -78,6 +81,12 @@ insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospita aabr_right = #{aabrRight,jdbcType=INTEGER}, + + abr_left = #{abrLeft,jdbcType=INTEGER}, + + + abr_right = #{abrRight,jdbcType=INTEGER}, + gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER}, @@ -162,7 +171,7 @@ delete from baby_patient_extend_ear_screen where id = #{id,jdbcType=VARCHAR} @@ -222,6 +231,12 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and aabr_right = #{aabrRight,jdbcType=INTEGER} + + and abr_left = #{abrLeft,jdbcType=INTEGER} + + + and abr_right = #{abrRight,jdbcType=INTEGER} + and gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER} @@ -296,7 +311,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,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,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid + id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,abr_left,abr_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,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid from baby_patient_extend_ear_screen status = 0 @@ -616,119 +631,125 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ @@ -736,7 +757,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_