jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6b98405b66b9d2fb23b2cfabafb3e32e2153fb1d

Authored by yangfei
1 parent f802a206e5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童听筛加字段

Showing 5 changed files with 215 additions and 116 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java View file @ 6b98405
... ... @@ -50,7 +50,16 @@
50 50 */
51 51 private Integer aabrRight;
52 52  
  53 + /**
  54 + * 左耳检查结果 1=通过 -1=未通过
  55 + */
  56 + private Integer abrLeft;
  57 + /**
  58 + * 右耳检查结果 1=通过 -1=未通过
  59 + */
  60 + private Integer abrRight;
53 61  
  62 +
54 63 /**
55 64 * 听力基因GJB2-35 del G 的值 1=野生型
56 65 */
... ... @@ -205,6 +214,22 @@
205 214  
206 215 public void setCreateHospitalId(String createHospitalId) {
207 216 this.createHospitalId = createHospitalId;
  217 + }
  218 +
  219 + public Integer getAbrLeft() {
  220 + return abrLeft;
  221 + }
  222 +
  223 + public void setAbrLeft(Integer abrLeft) {
  224 + this.abrLeft = abrLeft;
  225 + }
  226 +
  227 + public Integer getAbrRight() {
  228 + return abrRight;
  229 + }
  230 +
  231 + public void setAbrRight(Integer abrRight) {
  232 + this.abrRight = abrRight;
208 233 }
209 234  
210 235 public Date getLastUpdateDate() {
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java View file @ 6b98405
... ... @@ -64,8 +64,15 @@
64 64 * 右耳检查结果 1=通过 -1=未通过
65 65 */
66 66 private Integer aabrRight;
  67 + /**
  68 + * 左耳检查结果 1=通过 -1=未通过
  69 + */
  70 + private Integer abrLeft;
  71 + /**
  72 + * 右耳检查结果 1=通过 -1=未通过
  73 + */
  74 + private Integer abrRight;
67 75  
68   -
69 76 /**
70 77 * 听力基因GJB2-35 del G 的值 1=野生型
71 78 */
... ... @@ -140,6 +147,22 @@
140 147  
141 148 //筛查结果 1通过 2-未通过
142 149 private Integer scrIspass;
  150 +
  151 + public Integer getAbrLeft() {
  152 + return abrLeft;
  153 + }
  154 +
  155 + public void setAbrLeft(Integer abrLeft) {
  156 + this.abrLeft = abrLeft;
  157 + }
  158 +
  159 + public Integer getAbrRight() {
  160 + return abrRight;
  161 + }
  162 +
  163 + public void setAbrRight(Integer abrRight) {
  164 + this.abrRight = abrRight;
  165 + }
143 166  
144 167 public String getPid() {
145 168 return pid;
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml View file @ 6b98405
... ... @@ -14,6 +14,8 @@
14 14 <result column="oae_right" property="oaeRight" jdbcType="INTEGER"/>
15 15 <result column="aabr_left" property="aabrLeft" jdbcType="INTEGER"/>
16 16 <result column="aabr_right" property="aabrRight" jdbcType="INTEGER"/>
  17 + <result column="abr_left" property="abrLeft" jdbcType="INTEGER"/>
  18 + <result column="abr_right" property="abrRight" jdbcType="INTEGER"/>
17 19 <result column="gjb2_del_35" property="gjb2Del35" jdbcType="INTEGER"/>
18 20 <result column="gjb2_del_176" property="gjb2Del176" jdbcType="INTEGER"/>
19 21 <result column="gjb2_del_235" property="gjb2Del235" jdbcType="INTEGER"/>
20 22  
... ... @@ -38,12 +40,13 @@
38 40 <result column="status" property="status" jdbcType="INTEGER"/>
39 41 <result column="scr_ispass" property="scrIspass" jdbcType="INTEGER"/>
40 42 <result column="pid" property="pid" jdbcType="VARCHAR"/>
  43 +
41 44 </resultMap>
42 45  
43 46  
44 47 <insert id="addBabyPatientExtendEarScreen"
45 48 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreen">
46   -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})
  49 +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})
47 50 </insert>
48 51  
49 52  
... ... @@ -78,6 +81,12 @@
78 81 <if test="aabrRight != null">
79 82 aabr_right = #{aabrRight,jdbcType=INTEGER},
80 83 </if>
  84 + <if test="abrLeft != null">
  85 + abr_left = #{abrLeft,jdbcType=INTEGER},
  86 + </if>
  87 + <if test="abrRight != null">
  88 + abr_right = #{abrRight,jdbcType=INTEGER},
  89 + </if>
81 90 <if test="gjb2Del35 != null and gjb2Del35 >= 0">
82 91 gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER},
83 92 </if>
... ... @@ -162,7 +171,7 @@
162 171  
163 172 <select id="getBabyPatientExtendEarScreen" resultMap="BabyPatientExtendEarScreenResultMap"
164 173 parameterType="java.lang.String">
165   -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,next_check_time,last_update_date,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid
  174 +select 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
166 175 from baby_patient_extend_ear_screen where id = #{id,jdbcType=VARCHAR}
167 176 </select>
168 177  
... ... @@ -222,6 +231,12 @@
222 231 <if test="aabrRight != null">
223 232 and aabr_right = #{aabrRight,jdbcType=INTEGER}
224 233 </if>
  234 + <if test="abrLeft != null">
  235 + and abr_left = #{abrLeft,jdbcType=INTEGER}
  236 + </if>
  237 + <if test="abrRight != null">
  238 + and abr_right = #{abrRight,jdbcType=INTEGER}
  239 + </if>
225 240 <if test="gjb2Del35 != null and gjb2Del35 >= 0">
226 241 and gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER}
227 242 </if>
... ... @@ -296,7 +311,7 @@
296 311 <select id="queryBabyPatientExtendEarScreen" resultMap="BabyPatientExtendEarScreenResultMap"
297 312 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
298 313 select
299   - 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
  314 + 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
300 315 from baby_patient_extend_ear_screen
301 316 <include refid="BabyPatientExtendEarScreenCondition"/>
302 317 <include refid="orderAndLimit"/>
... ... @@ -305,7 +320,7 @@
305 320 <select id="queryEarScreenList" resultMap="BabyPatientExtendEarScreenResultMap"
306 321 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
307 322 select
308   - 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
  323 + 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
309 324 from baby_patient_extend_ear_screen
310 325 <where>
311 326 status = 0
312 327  
... ... @@ -616,119 +631,125 @@
616 631 <select id="notAuscultationBabyPatientExtendEarScreen" resultMap="BabyPatientExtendEarScreenResultMap"
617 632 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
618 633 select
619   - 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
  634 + 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
620 635 from baby_patient_extend_ear_screen
621 636  
622 637 <where>
623   - 1 = 1
624   - <if test="id != null and id != ''">
625   - and id = #{id,jdbcType=VARCHAR}
626   - </if>
627   - <if test="babyId != null and babyId != ''">
628   - and baby_id = #{babyId,jdbcType=VARCHAR}
629   - </if>
630   - <if test="babyIds != null ">
631   - and baby_id not in
632   - <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
633   - #{item}
634   - </foreach>
635   - </if>
636   - <if test="screenType != null and screenType >= 0">
637   - and screen_type = #{screenType,jdbcType=INTEGER}
638   - </if>
639   - <if test="checkHospitalIds != null ">
640   - and check_hospital_id in
641   - <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
642   - #{item}
643   - </foreach>
644   - </if>
645   - <if test="checkHospitalId != null and checkHospitalId != ''">
646   - and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR}
647   - </if>
648   - <if test="screenDate != null">
649   - and screen_date = #{screenDate,jdbcType=TIMESTAMP}
650   - </if>
651   - <if test="highRiskCause != null and highRiskCause != ''">
652   - and high_risk_cause = #{highRiskCause,jdbcType=VARCHAR}
653   - </if>
654   - <if test="oaeLeft != null">
655   - and oae_left = #{oaeLeft,jdbcType=INTEGER}
656   - </if>
657   - <if test="oaeRight != null">
658   - and oae_right = #{oaeRight,jdbcType=INTEGER}
659   - </if>
660   - <if test="aabrLeft != null">
661   - and aabr_left = #{aabrLeft,jdbcType=INTEGER}
662   - </if>
663   - <if test="aabrRight != null">
664   - and aabr_right = #{aabrRight,jdbcType=INTEGER}
665   - </if>
666   - <if test="gjb2Del35 != null and gjb2Del35 >= 0">
667   - and gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER}
668   - </if>
669   - <if test="gjb2Del176 != null and gjb2Del176 >= 0">
670   - and gjb2_del_176 = #{gjb2Del176,jdbcType=INTEGER}
671   - </if>
672   - <if test="gjb2Del235 != null and gjb2Del235 >= 0">
673   - and gjb2_del_235 = #{gjb2Del235,jdbcType=INTEGER}
674   - </if>
675   - <if test="gjb2Del299 != null and gjb2Del299 >= 0">
676   - and gjb2_del_299 = #{gjb2Del299,jdbcType=INTEGER}
677   - </if>
678   - <if test="gjb3Slc26a4538 != null and gjb3Slc26a4538 >= 0">
679   - and gjb3_slc26a4_538 = #{gjb3Slc26a4538,jdbcType=INTEGER}
680   - </if>
681   - <if test="gjb3Slc26a42168 != null and gjb3Slc26a42168 >= 0">
682   - and gjb3_slc26a4_2168 = #{gjb3Slc26a42168,jdbcType=INTEGER}
683   - </if>
684   - <if test="gjb3Slc26a4Ivs7 != null and gjb3Slc26a4Ivs7 >= 0">
685   - and gjb3_slc26a4_ivs7 = #{gjb3Slc26a4Ivs7,jdbcType=INTEGER}
686   - </if>
687   - <if test="processOptionType != null and processOptionType >= 0">
688   - and process_option_type = #{processOptionType,jdbcType=INTEGER}
689   - </if>
690   - <if test="processOptionDesc != null and processOptionDesc != ''">
691   - and process_option_desc = #{processOptionDesc,jdbcType=VARCHAR}
692   - </if>
693   - <if test="guidOpinion != null and guidOpinion != ''">
694   - and guid_opinion = #{guidOpinion,jdbcType=VARCHAR}
695   - </if>
696   - <if test="checkDoctorId != null and checkDoctorId != ''">
697   - and check_doctor_id = #{checkDoctorId,jdbcType=VARCHAR}
698   - </if>
699   - <if test="referralDate != null">
700   - and referral_date = #{referralDate,jdbcType=TIMESTAMP}
701   - </if>
702   - <if test="createDate != null">
703   - and create_date = #{createDate,jdbcType=TIMESTAMP}
704   - </if>
705   - <if test="createUserId != null and createUserId != ''">
706   - and create_user_id = #{createUserId,jdbcType=VARCHAR}
707   - </if>
708   - <if test="createHospitalId != null and createHospitalId != ''">
709   - and create_hospital_id = #{createHospitalId,jdbcType=VARCHAR}
710   - </if>
711   - <if test="nextCheckTime != null">
712   - and next_check_time = #{nextCheckTime,jdbcType=TIMESTAMP}
713   - </if>
714   - <if test="lastUpdateDate != null">
715   - and last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP}
716   - </if>
717   - <if test="lastUpdateUserId != null and lastUpdateUserId != ''">
718   - and last_update_user_id = #{lastUpdateUserId,jdbcType=VARCHAR}
719   - </if>
720   - <if test="lastUpdateHospitalId != null and lastUpdateHospitalId != ''">
721   - and last_update_hospital_id = #{lastUpdateHospitalId,jdbcType=VARCHAR}
722   - </if>
723   - <if test="pid != null and pid != ''">
724   - and pid = #{pid,jdbcType=VARCHAR}
725   - </if>
726   - <if test="status != null and status >= 0">
727   - and status = #{status,jdbcType=INTEGER}
728   - </if>
729   - <if test="scrIspass != null and scrIspass >= 0">
730   - and scr_ispass = #{scrIspass,jdbcType=INTEGER}
731   - </if>
  638 + 1 = 1
  639 + <if test="id != null and id != ''">
  640 + and id = #{id,jdbcType=VARCHAR}
  641 + </if>
  642 + <if test="babyId != null and babyId != ''">
  643 + and baby_id = #{babyId,jdbcType=VARCHAR}
  644 + </if>
  645 + <if test="babyIds != null ">
  646 + and baby_id not in
  647 + <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
  648 + #{item}
  649 + </foreach>
  650 + </if>
  651 + <if test="screenType != null and screenType >= 0">
  652 + and screen_type = #{screenType,jdbcType=INTEGER}
  653 + </if>
  654 + <if test="checkHospitalIds != null ">
  655 + and check_hospital_id in
  656 + <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
  657 + #{item}
  658 + </foreach>
  659 + </if>
  660 + <if test="checkHospitalId != null and checkHospitalId != ''">
  661 + and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR}
  662 + </if>
  663 + <if test="screenDate != null">
  664 + and screen_date = #{screenDate,jdbcType=TIMESTAMP}
  665 + </if>
  666 + <if test="highRiskCause != null and highRiskCause != ''">
  667 + and high_risk_cause = #{highRiskCause,jdbcType=VARCHAR}
  668 + </if>
  669 + <if test="oaeLeft != null">
  670 + and oae_left = #{oaeLeft,jdbcType=INTEGER}
  671 + </if>
  672 + <if test="oaeRight != null">
  673 + and oae_right = #{oaeRight,jdbcType=INTEGER}
  674 + </if>
  675 + <if test="aabrLeft != null">
  676 + and aabr_left = #{aabrLeft,jdbcType=INTEGER}
  677 + </if>
  678 + <if test="aabrRight != null">
  679 + and aabr_right = #{aabrRight,jdbcType=INTEGER}
  680 + </if>
  681 + <if test="abrLeft != null">
  682 + and abr_left = #{abrLeft,jdbcType=INTEGER}
  683 + </if>
  684 + <if test="abrRight != null">
  685 + and abr_right = #{abrRight,jdbcType=INTEGER}
  686 + </if>
  687 + <if test="gjb2Del35 != null and gjb2Del35 >= 0">
  688 + and gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER}
  689 + </if>
  690 + <if test="gjb2Del176 != null and gjb2Del176 >= 0">
  691 + and gjb2_del_176 = #{gjb2Del176,jdbcType=INTEGER}
  692 + </if>
  693 + <if test="gjb2Del235 != null and gjb2Del235 >= 0">
  694 + and gjb2_del_235 = #{gjb2Del235,jdbcType=INTEGER}
  695 + </if>
  696 + <if test="gjb2Del299 != null and gjb2Del299 >= 0">
  697 + and gjb2_del_299 = #{gjb2Del299,jdbcType=INTEGER}
  698 + </if>
  699 + <if test="gjb3Slc26a4538 != null and gjb3Slc26a4538 >= 0">
  700 + and gjb3_slc26a4_538 = #{gjb3Slc26a4538,jdbcType=INTEGER}
  701 + </if>
  702 + <if test="gjb3Slc26a42168 != null and gjb3Slc26a42168 >= 0">
  703 + and gjb3_slc26a4_2168 = #{gjb3Slc26a42168,jdbcType=INTEGER}
  704 + </if>
  705 + <if test="gjb3Slc26a4Ivs7 != null and gjb3Slc26a4Ivs7 >= 0">
  706 + and gjb3_slc26a4_ivs7 = #{gjb3Slc26a4Ivs7,jdbcType=INTEGER}
  707 + </if>
  708 + <if test="processOptionType != null and processOptionType >= 0">
  709 + and process_option_type = #{processOptionType,jdbcType=INTEGER}
  710 + </if>
  711 + <if test="processOptionDesc != null and processOptionDesc != ''">
  712 + and process_option_desc = #{processOptionDesc,jdbcType=VARCHAR}
  713 + </if>
  714 + <if test="guidOpinion != null and guidOpinion != ''">
  715 + and guid_opinion = #{guidOpinion,jdbcType=VARCHAR}
  716 + </if>
  717 + <if test="checkDoctorId != null and checkDoctorId != ''">
  718 + and check_doctor_id = #{checkDoctorId,jdbcType=VARCHAR}
  719 + </if>
  720 + <if test="referralDate != null">
  721 + and referral_date = #{referralDate,jdbcType=TIMESTAMP}
  722 + </if>
  723 + <if test="createDate != null">
  724 + and create_date = #{createDate,jdbcType=TIMESTAMP}
  725 + </if>
  726 + <if test="createUserId != null and createUserId != ''">
  727 + and create_user_id = #{createUserId,jdbcType=VARCHAR}
  728 + </if>
  729 + <if test="createHospitalId != null and createHospitalId != ''">
  730 + and create_hospital_id = #{createHospitalId,jdbcType=VARCHAR}
  731 + </if>
  732 + <if test="nextCheckTime != null">
  733 + and next_check_time = #{nextCheckTime,jdbcType=TIMESTAMP}
  734 + </if>
  735 + <if test="lastUpdateDate != null">
  736 + and last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP}
  737 + </if>
  738 + <if test="lastUpdateUserId != null and lastUpdateUserId != ''">
  739 + and last_update_user_id = #{lastUpdateUserId,jdbcType=VARCHAR}
  740 + </if>
  741 + <if test="lastUpdateHospitalId != null and lastUpdateHospitalId != ''">
  742 + and last_update_hospital_id = #{lastUpdateHospitalId,jdbcType=VARCHAR}
  743 + </if>
  744 + <if test="pid != null and pid != ''">
  745 + and pid = #{pid,jdbcType=VARCHAR}
  746 + </if>
  747 + <if test="status != null and status >= 0">
  748 + and status = #{status,jdbcType=INTEGER}
  749 + </if>
  750 + <if test="scrIspass != null and scrIspass >= 0">
  751 + and scr_ispass = #{scrIspass,jdbcType=INTEGER}
  752 + </if>
732 753 </where>
733 754 <include refid="orderAndLimit"/>
734 755 </select>
... ... @@ -736,7 +757,7 @@
736 757 <select id="dubiousScreen" resultMap="BabyPatientExtendEarScreenResultMap"
737 758 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreenQuery">
738 759 select
739   - 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
  760 + 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
740 761 from baby_patient_extend_ear_screen
741 762 <where>
742 763 scr_ispass = 2
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 6b98405
... ... @@ -1681,6 +1681,10 @@
1681 1681 data.put("aabrLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft() == null ? 0 : babyPatientExtendEarScreen.getAabrLeft()));
1682 1682 data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight() == null ? "" : babyPatientExtendEarScreen.getAabrRight());
1683 1683 data.put("aabrRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight() == null ? 0 : babyPatientExtendEarScreen.getAabrRight()));
  1684 + data.put("abrLeft", babyPatientExtendEarScreen.getAbrLeft() == null ? "" : babyPatientExtendEarScreen.getAbrLeft());
  1685 + data.put("abrLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAbrLeft() == null ? 0 : babyPatientExtendEarScreen.getAbrLeft()));
  1686 + data.put("abrRight", babyPatientExtendEarScreen.getAbrRight() == null ? "" : babyPatientExtendEarScreen.getAbrRight());
  1687 + data.put("abrRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAbrRight() == null ? 0 : babyPatientExtendEarScreen.getAbrRight()));
1684 1688 data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() == null ? "" : babyPatientExtendEarScreen.getGjb2Del35());
1685 1689 data.put("gjb2Del35Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del35()));
1686 1690 data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() == null ? "" : babyPatientExtendEarScreen.getGjb2Del176());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java View file @ 6b98405
... ... @@ -61,6 +61,14 @@
61 61 * 右耳检查结果 1=通过 -1=未通过
62 62 */
63 63 private Integer aabrRight;
  64 + /**
  65 + * 左耳检查结果 1=通过 -1=未通过
  66 + */
  67 + private Integer abrLeft;
  68 + /**
  69 + * 右耳检查结果 1=通过 -1=未通过
  70 + */
  71 + private Integer abrRight;
64 72  
65 73  
66 74 /**
... ... @@ -120,6 +128,8 @@
120 128 babyPatientExtendEarScreen.setOaeRight(oaeRight);
121 129 babyPatientExtendEarScreen.setAabrLeft(aabrLeft);
122 130 babyPatientExtendEarScreen.setAabrRight(aabrRight);
  131 + babyPatientExtendEarScreen.setAbrLeft(abrLeft);
  132 + babyPatientExtendEarScreen.setAbrRight(abrRight);
123 133 babyPatientExtendEarScreen.setGjb2Del176(gjb2Del176);
124 134 babyPatientExtendEarScreen.setGjb2Del35(gjb2Del35);
125 135 babyPatientExtendEarScreen.setGjb2Del235(gjb2Del235);
... ... @@ -157,6 +167,22 @@
157 167 * 诊断时间
158 168 */
159 169 private String referralDate;
  170 +
  171 + public Integer getAbrLeft() {
  172 + return abrLeft;
  173 + }
  174 +
  175 + public void setAbrLeft(Integer abrLeft) {
  176 + this.abrLeft = abrLeft;
  177 + }
  178 +
  179 + public Integer getAbrRight() {
  180 + return abrRight;
  181 + }
  182 +
  183 + public void setAbrRight(Integer abrRight) {
  184 + this.abrRight = abrRight;
  185 + }
160 186  
161 187 public Integer getRrna1494() {
162 188 return rrna1494;