jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f7684407c93582db722b8943a86c9d9acf31d9dd

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

update

Showing 9 changed files with 125 additions and 10 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java View file @ f768440
... ... @@ -20,7 +20,10 @@
20 20 * 检测医院ID
21 21 */
22 22 private String hospitalId;
23   -
  23 + //医生签名
  24 + private String doctorSign;
  25 + //患者签名
  26 + private String patientSign;
24 27 private String hospitalName;
25 28 /**
26 29 * 诊断时间
... ... @@ -1400,6 +1403,22 @@
1400 1403  
1401 1404 public void setModifyTime(Date modifyTime) {
1402 1405 this.modifyTime = modifyTime;
  1406 + }
  1407 +
  1408 + public String getDoctorSign() {
  1409 + return doctorSign;
  1410 + }
  1411 +
  1412 + public void setDoctorSign(String doctorSign) {
  1413 + this.doctorSign = doctorSign;
  1414 + }
  1415 +
  1416 + public String getPatientSign() {
  1417 + return patientSign;
  1418 + }
  1419 +
  1420 + public void setPatientSign(String patientSign) {
  1421 + this.patientSign = patientSign;
1403 1422 }
1404 1423  
1405 1424 public Integer getIfdel() {
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java View file @ f768440
... ... @@ -12,7 +12,10 @@
12 12 private String id;
13 13  
14 14 private String babyId;
15   -
  15 + //医生签名
  16 + private String doctorSign;
  17 + //患者签名
  18 + private String patientSign;
16 19 private String[] babyIds;
17 20 /**
18 21 * 筛查类型 1=初筛 2=复筛
... ... @@ -498,6 +501,22 @@
498 501  
499 502 public String getProcessOptionDesc() {
500 503 return processOptionDesc;
  504 + }
  505 +
  506 + public String getDoctorSign() {
  507 + return doctorSign;
  508 + }
  509 +
  510 + public void setDoctorSign(String doctorSign) {
  511 + this.doctorSign = doctorSign;
  512 + }
  513 +
  514 + public String getPatientSign() {
  515 + return patientSign;
  516 + }
  517 +
  518 + public void setPatientSign(String patientSign) {
  519 + this.patientSign = patientSign;
501 520 }
502 521  
503 522 public void setProcessOptionDesc(String processOptionDesc) {
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml View file @ f768440
... ... @@ -108,12 +108,14 @@
108 108 <result column="confirm_result" property="confirmResult" jdbcType="VARCHAR"/>
109 109 <result column="confirm_time" property="confirmTime" jdbcType="TIMESTAMP"/>
110 110 <result column="pid" property="pid" jdbcType="VARCHAR"/>
  111 + <result column="doctorSign" property="doctorSign" jdbcType="VARCHAR"/>
  112 + <result column="patientSign" property="patientSign" jdbcType="VARCHAR"/>
111 113 </resultMap>
112 114  
113 115  
114 116 <insert id="addBabyPatientExtendEarHearingDiagnose"
115 117 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnose">
116   -insert into baby_patient_extend_ear_hearing_diagnose (id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_l_wave,abr_left_lll_wave,abr_left_V_wave,abr_left_shield,abr_right_dbnhl,abr_right_l_wave,abr_right_lll_wave,abr_right_V_wave,abr_right_shield,abr_thr_left_dbnhl,abr_thr_left_ms,abr_thr_left_shield_dbnhl,abr_thr_right_dbnhl,abr_thr_right_ms,abr_thr_right_shield_dbnhl,abr_bc_left_thr_dbnhl,abr_bc_left_thr_ms,abr_bc_left_thr_shield_dbnhl,abr_bc_right_thr_dbnhl,abr_bc_right_thr_ms,abr_bc_right_thr_shield_dbnhl,reaction_thr_left_dbnhl,reaction_thr_left_shield_dbnhl,reaction_thr_right_dbnhl,reaction_thr_right_shield_dbnhl,oae_left_750,oae_left_1k,oae_left_2k,oae_left_3k,oae_left_4k,oae_left_6k,oae_left_8k,oae_left_10k,oae_right_750,oae_right_1k,oae_right_2k,oae_right_3k,oae_right_4k,oae_right_6k,oae_right_8k,oae_right_10k,acad_left_curve_type,acad_left_drum_cp,acad_left_acco,acad_left_secondo_volume,acad_left_gradient,acad_right_reflect_tts,acad_left_1K_reflect_thre,acad_right_curve_type,acad_right_drum_cp,acad_right_acco,acad_right_secondo_volume,acad_right_gradient,acad_left_reflect_tts,acad_right_1K_reflect_thre,sound_refl_left_ipsi_500,sound_refl_left_ipsi_1k,sound_refl_left_ipsi_2k,sound_refl_left_ipsi_4k,sound_refl_left_offsi_500,sound_refl_left_offsi_1k,sound_refl_left_offsi_2k,sound_refl_left_offsi_4k,sound_refl_left_atten,sound_refl_right_ipsi_500,sound_refl_right_ipsi_1k,sound_refl_right_ipsi_2k,sound_refl_right_ipsi_4k,sound_refl_right_offsi_500,sound_refl_right_offsi_1k,sound_refl_right_offsi_2k,sound_refl_right_offsi_4k,sound_refl_right_atten,aabr_left_if_pass,aabr_right_if_pass,assr_left_500,assr_left_1k,assr_left_2k,assr_left_4k,assr_right_500,assr_right_1k,assr_right_2k,assr_right_4k,diagn_hand_sugge,diagn_guide_sugge,diagn_doctor_id,diagn_next_time,create_time,create_id,modify_id,modify_time,ifdel,enalble,isconfirm,diagn_result,confirm_result,confirm_time,pid) values (#{id},#{babyId},#{hospitalId},#{diagnoseTime},#{highFactor},#{abrLeftDbnhl},#{abrLeftLWave},#{abrLeftLllWave},#{abrLeftVWave},#{abrLeftShield},#{abrRightDbnhl},#{abrRightLWave},#{abrRightLllWave},#{abrRightVWave},#{abrRightShield},#{abrThrLeftDbnhl},#{abrThrLeftMs},#{abrThrLeftShieldDbnhl},#{abrThrRightDbnhl},#{abrThrRightMs},#{abrThrRightShieldDbnhl},#{abrBcLeftThrDbnhl},#{abrBcLeftThrMs},#{abrBcLeftThrShieldDbnhl},#{abrBcRightThrDbnhl},#{abrBcRightThrMs},#{abrBcRightThrShieldDbnhl},#{reactionThrLeftDbnhl},#{reactionThrLeftShieldDbnhl},#{reactionThrRightDbnhl},#{reactionThrRightShieldDbnhl},#{oaeLeft750},#{oaeLeft1k},#{oaeLeft2k},#{oaeLeft3k},#{oaeLeft4k},#{oaeLeft6k},#{oaeLeft8k},#{oaeLeft10k},#{oaeRight750},#{oaeRight1k},#{oaeRight2k},#{oaeRight3k},#{oaeRight4k},#{oaeRight6k},#{oaeRight8k},#{oaeRight10k},#{acadLeftCurveType},#{acadLeftDrumCp},#{acadLeftAcco},#{acadLeftSecondoVolume},#{acadLeftGradient},#{acadLeftReflectTTS},#{acadLeft1kReflectThre},#{acadRightCurveType},#{acadRightDrumCp},#{acadRightAcco},#{acadRightSecondoVolume},#{acadRightGradient},#{acadRightReflectTTS},#{acadRight1kReflectThre},#{soundReflLeftIpsi500},#{soundReflLeftIpsi1k},#{soundReflLeftIpsi2k},#{soundReflLeftIpsi4k},#{soundReflLeftOffsi500},#{soundReflLeftOffsi1k},#{soundReflLeftOffsi2k},#{soundReflLeftOffsi4k},#{soundReflLeftAtten},#{soundReflRightIpsi500},#{soundReflRightIpsi1k},#{soundReflRightIpsi2k},#{soundReflRightIpsi4k},#{soundReflRightOffsi500},#{soundReflRightOffsi1k},#{soundReflRightOffsi2k},#{soundReflRightOffsi4k},#{soundReflRightAtten},#{aabrLeftIfPass},#{aabrRightIfPass},#{assrLeft500},#{assrLeft1k},#{assrLeft2k},#{assrLeft4k},#{assrRight500},#{assrRight1k},#{assrRight2k},#{assrRight4k},#{diagnHandSugge},#{diagnGuideSugge},#{diagnDoctorId},#{diagnNextTime},#{createTime},#{createId},#{modifyId},#{modifyTime},#{ifdel},#{enalble},#{isconfirm},#{diagnResult},#{confirmResult},#{confirmTime},#{pid})
  118 +insert into baby_patient_extend_ear_hearing_diagnose (id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_l_wave,abr_left_lll_wave,abr_left_V_wave,abr_left_shield,abr_right_dbnhl,abr_right_l_wave,abr_right_lll_wave,abr_right_V_wave,abr_right_shield,abr_thr_left_dbnhl,abr_thr_left_ms,abr_thr_left_shield_dbnhl,abr_thr_right_dbnhl,abr_thr_right_ms,abr_thr_right_shield_dbnhl,abr_bc_left_thr_dbnhl,abr_bc_left_thr_ms,abr_bc_left_thr_shield_dbnhl,abr_bc_right_thr_dbnhl,abr_bc_right_thr_ms,abr_bc_right_thr_shield_dbnhl,reaction_thr_left_dbnhl,reaction_thr_left_shield_dbnhl,reaction_thr_right_dbnhl,reaction_thr_right_shield_dbnhl,oae_left_750,oae_left_1k,oae_left_2k,oae_left_3k,oae_left_4k,oae_left_6k,oae_left_8k,oae_left_10k,oae_right_750,oae_right_1k,oae_right_2k,oae_right_3k,oae_right_4k,oae_right_6k,oae_right_8k,oae_right_10k,acad_left_curve_type,acad_left_drum_cp,acad_left_acco,acad_left_secondo_volume,acad_left_gradient,acad_right_reflect_tts,acad_left_1K_reflect_thre,acad_right_curve_type,acad_right_drum_cp,acad_right_acco,acad_right_secondo_volume,acad_right_gradient,acad_left_reflect_tts,acad_right_1K_reflect_thre,sound_refl_left_ipsi_500,sound_refl_left_ipsi_1k,sound_refl_left_ipsi_2k,sound_refl_left_ipsi_4k,sound_refl_left_offsi_500,sound_refl_left_offsi_1k,sound_refl_left_offsi_2k,sound_refl_left_offsi_4k,sound_refl_left_atten,sound_refl_right_ipsi_500,sound_refl_right_ipsi_1k,sound_refl_right_ipsi_2k,sound_refl_right_ipsi_4k,sound_refl_right_offsi_500,sound_refl_right_offsi_1k,sound_refl_right_offsi_2k,sound_refl_right_offsi_4k,sound_refl_right_atten,aabr_left_if_pass,aabr_right_if_pass,assr_left_500,assr_left_1k,assr_left_2k,assr_left_4k,assr_right_500,assr_right_1k,assr_right_2k,assr_right_4k,diagn_hand_sugge,diagn_guide_sugge,diagn_doctor_id,diagn_next_time,create_time,create_id,modify_id,modify_time,ifdel,enalble,isconfirm,diagn_result,confirm_result,confirm_time,pid,doctorSign,patientSign) values (#{id},#{babyId},#{hospitalId},#{diagnoseTime},#{highFactor},#{abrLeftDbnhl},#{abrLeftLWave},#{abrLeftLllWave},#{abrLeftVWave},#{abrLeftShield},#{abrRightDbnhl},#{abrRightLWave},#{abrRightLllWave},#{abrRightVWave},#{abrRightShield},#{abrThrLeftDbnhl},#{abrThrLeftMs},#{abrThrLeftShieldDbnhl},#{abrThrRightDbnhl},#{abrThrRightMs},#{abrThrRightShieldDbnhl},#{abrBcLeftThrDbnhl},#{abrBcLeftThrMs},#{abrBcLeftThrShieldDbnhl},#{abrBcRightThrDbnhl},#{abrBcRightThrMs},#{abrBcRightThrShieldDbnhl},#{reactionThrLeftDbnhl},#{reactionThrLeftShieldDbnhl},#{reactionThrRightDbnhl},#{reactionThrRightShieldDbnhl},#{oaeLeft750},#{oaeLeft1k},#{oaeLeft2k},#{oaeLeft3k},#{oaeLeft4k},#{oaeLeft6k},#{oaeLeft8k},#{oaeLeft10k},#{oaeRight750},#{oaeRight1k},#{oaeRight2k},#{oaeRight3k},#{oaeRight4k},#{oaeRight6k},#{oaeRight8k},#{oaeRight10k},#{acadLeftCurveType},#{acadLeftDrumCp},#{acadLeftAcco},#{acadLeftSecondoVolume},#{acadLeftGradient},#{acadLeftReflectTTS},#{acadLeft1kReflectThre},#{acadRightCurveType},#{acadRightDrumCp},#{acadRightAcco},#{acadRightSecondoVolume},#{acadRightGradient},#{acadRightReflectTTS},#{acadRight1kReflectThre},#{soundReflLeftIpsi500},#{soundReflLeftIpsi1k},#{soundReflLeftIpsi2k},#{soundReflLeftIpsi4k},#{soundReflLeftOffsi500},#{soundReflLeftOffsi1k},#{soundReflLeftOffsi2k},#{soundReflLeftOffsi4k},#{soundReflLeftAtten},#{soundReflRightIpsi500},#{soundReflRightIpsi1k},#{soundReflRightIpsi2k},#{soundReflRightIpsi4k},#{soundReflRightOffsi500},#{soundReflRightOffsi1k},#{soundReflRightOffsi2k},#{soundReflRightOffsi4k},#{soundReflRightAtten},#{aabrLeftIfPass},#{aabrRightIfPass},#{assrLeft500},#{assrLeft1k},#{assrLeft2k},#{assrLeft4k},#{assrRight500},#{assrRight1k},#{assrRight2k},#{assrRight4k},#{diagnHandSugge},#{diagnGuideSugge},#{diagnDoctorId},#{diagnNextTime},#{createTime},#{createId},#{modifyId},#{modifyTime},#{ifdel},#{enalble},#{isconfirm},#{diagnResult},#{confirmResult},#{confirmTime},#{pid},#{doctorSign},#{doctorSign})
117 119 </insert>
118 120  
119 121  
... ... @@ -432,6 +434,12 @@
432 434 <if test="confirmTime != null">
433 435 confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
434 436 </if>
  437 + <if test="doctorSign != null and doctorSign != ''">
  438 + doctorSign = #{doctorSign,jdbcType=VARCHAR},
  439 + </if>
  440 + <if test="patientSign != null and patientSign != ''">
  441 + patientSign = #{patientSign,jdbcType=VARCHAR},
  442 + </if>
435 443 </set>
436 444 where id = #{id,jdbcType=VARCHAR}
437 445 </update>
... ... @@ -444,7 +452,7 @@
444 452  
445 453 <select id="getBabyPatientExtendEarHearingDiagnose" resultMap="BabyPatientExtendEarHearingDiagnoseResultMap"
446 454 parameterType="java.lang.String">
447   -select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_l_wave,abr_left_lll_wave,abr_left_V_wave,abr_left_shield,abr_right_dbnhl,abr_right_l_wave,abr_right_lll_wave,abr_right_V_wave,abr_right_shield,abr_thr_left_dbnhl,abr_thr_left_ms,abr_thr_left_shield_dbnhl,abr_thr_right_dbnhl,abr_thr_right_ms,abr_thr_right_shield_dbnhl,abr_bc_left_thr_dbnhl,abr_bc_left_thr_ms,abr_bc_left_thr_shield_dbnhl,abr_bc_right_thr_dbnhl,abr_bc_right_thr_ms,abr_bc_right_thr_shield_dbnhl,reaction_thr_left_dbnhl,reaction_thr_left_shield_dbnhl,reaction_thr_right_dbnhl,reaction_thr_right_shield_dbnhl,oae_left_750,oae_left_1k,oae_left_2k,oae_left_3k,oae_left_4k,oae_left_6k,oae_left_8k,oae_left_10k,oae_right_750,oae_right_1k,oae_right_2k,oae_right_3k,oae_right_4k,oae_right_6k,oae_right_8k,oae_right_10k,acad_left_curve_type,acad_left_drum_cp,acad_left_acco,acad_left_secondo_volume,acad_left_gradient,acad_left_1K_reflect_thre,acad_left_reflect_tts,acad_right_curve_type,acad_right_drum_cp,acad_right_acco,acad_right_secondo_volume,acad_right_gradient,acad_right_1K_reflect_thre,acad_right_reflect_tts,sound_refl_left_ipsi_500,sound_refl_left_ipsi_1k,sound_refl_left_ipsi_2k,sound_refl_left_ipsi_4k,sound_refl_left_offsi_500,sound_refl_left_offsi_1k,sound_refl_left_offsi_2k,sound_refl_left_offsi_4k,sound_refl_left_atten,sound_refl_right_ipsi_500,sound_refl_right_ipsi_1k,sound_refl_right_ipsi_2k,sound_refl_right_ipsi_4k,sound_refl_right_offsi_500,sound_refl_right_offsi_1k,sound_refl_right_offsi_2k,sound_refl_right_offsi_4k,sound_refl_right_atten,aabr_left_if_pass,aabr_right_if_pass,assr_left_500,assr_left_1k,assr_left_2k,assr_left_4k,assr_right_500,assr_right_1k,assr_right_2k,assr_right_4k,diagn_hand_sugge,diagn_guide_sugge,diagn_doctor_id,diagn_next_time,create_time,create_id,modify_id,modify_time,ifdel,enalble,isconfirm,diagn_result,confirm_result,confirm_time,pid
  455 +select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_l_wave,abr_left_lll_wave,abr_left_V_wave,abr_left_shield,abr_right_dbnhl,abr_right_l_wave,abr_right_lll_wave,abr_right_V_wave,abr_right_shield,abr_thr_left_dbnhl,abr_thr_left_ms,abr_thr_left_shield_dbnhl,abr_thr_right_dbnhl,abr_thr_right_ms,abr_thr_right_shield_dbnhl,abr_bc_left_thr_dbnhl,abr_bc_left_thr_ms,abr_bc_left_thr_shield_dbnhl,abr_bc_right_thr_dbnhl,abr_bc_right_thr_ms,abr_bc_right_thr_shield_dbnhl,reaction_thr_left_dbnhl,reaction_thr_left_shield_dbnhl,reaction_thr_right_dbnhl,reaction_thr_right_shield_dbnhl,oae_left_750,oae_left_1k,oae_left_2k,oae_left_3k,oae_left_4k,oae_left_6k,oae_left_8k,oae_left_10k,oae_right_750,oae_right_1k,oae_right_2k,oae_right_3k,oae_right_4k,oae_right_6k,oae_right_8k,oae_right_10k,acad_left_curve_type,acad_left_drum_cp,acad_left_acco,acad_left_secondo_volume,acad_left_gradient,acad_left_1K_reflect_thre,acad_left_reflect_tts,acad_right_curve_type,acad_right_drum_cp,acad_right_acco,acad_right_secondo_volume,acad_right_gradient,acad_right_1K_reflect_thre,acad_right_reflect_tts,sound_refl_left_ipsi_500,sound_refl_left_ipsi_1k,sound_refl_left_ipsi_2k,sound_refl_left_ipsi_4k,sound_refl_left_offsi_500,sound_refl_left_offsi_1k,sound_refl_left_offsi_2k,sound_refl_left_offsi_4k,sound_refl_left_atten,sound_refl_right_ipsi_500,sound_refl_right_ipsi_1k,sound_refl_right_ipsi_2k,sound_refl_right_ipsi_4k,sound_refl_right_offsi_500,sound_refl_right_offsi_1k,sound_refl_right_offsi_2k,sound_refl_right_offsi_4k,sound_refl_right_atten,aabr_left_if_pass,aabr_right_if_pass,assr_left_500,assr_left_1k,assr_left_2k,assr_left_4k,assr_right_500,assr_right_1k,assr_right_2k,assr_right_4k,diagn_hand_sugge,diagn_guide_sugge,diagn_doctor_id,diagn_next_time,create_time,create_id,modify_id,modify_time,ifdel,enalble,isconfirm,diagn_result,confirm_result,confirm_time,pid,doctorSign,patientSign
448 456 from baby_patient_extend_ear_hearing_diagnose where id = #{id,jdbcType=VARCHAR}
449 457 </select>
450 458  
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml View file @ f768440
... ... @@ -50,13 +50,14 @@
50 50 <result column="motherGjb3Slc26a4Ivs7" property="motherGjb3Slc26a4Ivs7" jdbcType="INTEGER"/>
51 51 <result column="motherRrna1494" property="motherRrna1494" jdbcType="INTEGER"/>
52 52 <result column="motherRrna1555" property="motherRrna1555" jdbcType="INTEGER"/>
53   -
  53 + <result column="doctorSign" property="doctorSign" jdbcType="VARCHAR"/>
  54 + <result column="patientSign" property="patientSign" jdbcType="VARCHAR"/>
54 55 </resultMap>
55 56  
56 57  
57 58 <insert id="addBabyPatientExtendEarScreen"
58 59 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarScreen">
59   -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,motherGjb2Del35,motherGjb2Del176,motherGjb2Del235,motherGjb2Del299,motherGjb3Slc26a4538,motherGjb3Slc26a42168,motherGjb3Slc26a4Ivs7,motherRrna1494,motherRrna1555) 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},#{motherGjb2Del35},#{motherGjb2Del176},#{motherGjb2Del235},#{motherGjb2Del299},#{motherGjb3Slc26a4538},#{motherGjb3Slc26a42168},#{motherGjb3Slc26a4Ivs7},#{motherRrna1494},#{motherRrna1555})
  60 +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,motherGjb2Del35,motherGjb2Del176,motherGjb2Del235,motherGjb2Del299,motherGjb3Slc26a4538,motherGjb3Slc26a42168,motherGjb3Slc26a4Ivs7,motherRrna1494,motherRrna1555,doctorSign,patientSign) 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},#{motherGjb2Del35},#{motherGjb2Del176},#{motherGjb2Del235},#{motherGjb2Del299},#{motherGjb3Slc26a4538},#{motherGjb3Slc26a42168},#{motherGjb3Slc26a4Ivs7},#{motherRrna1494},#{motherRrna1555},#{doctorSign},#{patientSign})
60 61 </insert>
61 62  
62 63  
... ... @@ -198,7 +199,12 @@
198 199 <if test="motherRrna1555 != null and motherRrna1555 >= 0">
199 200 motherRrna1555 = #{motherRrna1555,jdbcType=INTEGER},
200 201 </if>
201   -
  202 + <if test="doctorSign != null and doctorSign != ''">
  203 + doctorSign = #{doctorSign,jdbcType=VARCHAR},
  204 + </if>
  205 + <if test="patientSign != null and patientSign != ''">
  206 + patientSign = #{patientSign,jdbcType=VARCHAR},
  207 + </if>
202 208 </set>
203 209 where id = #{id,jdbcType=VARCHAR}
204 210 </update>
... ... @@ -219,7 +225,9 @@
219 225 motherGjb3Slc26a42168,
220 226 motherGjb3Slc26a4Ivs7,
221 227 motherRrna1494,
222   -motherRrna1555
  228 +motherRrna1555,
  229 +doctorSign,
  230 +patientSign
223 231 from baby_patient_extend_ear_screen where id = #{id,jdbcType=VARCHAR}
224 232 </select>
225 233  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java View file @ f768440
... ... @@ -42,6 +42,19 @@
42 42 }
43 43 }
44 44  
  45 + /**
  46 + * 眼保健检查 上传 患者签名
  47 + *
  48 + * @return
  49 + */
  50 + @RequestMapping(method = RequestMethod.GET, value = "/babyEyeCheckSign")
  51 + @ResponseBody
  52 + @TokenRequired
  53 + public BaseResponse babyEyeCheckSign(String patientSign, String id, HttpServletRequest request) {
  54 + return babyEyeCheckService.babyEyeCheckSign(patientSign, id);
  55 + }
  56 +
  57 +
45 58 @ResponseBody
46 59 @TokenRequired
47 60 @RequestMapping(value = "/query/{id}", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ f768440
... ... @@ -1724,6 +1724,9 @@
1724 1724 Map<String, Object> data = new HashedMap();
1725 1725 data.put("id", babyPatientExtendEarScreen.getId());
1726 1726 data.put("babyId", babyPatientExtendEarScreen.getBabyId());
  1727 + data.put("doctorSign", babyPatientExtendEarScreen.getDoctorSign());
  1728 + data.put("patientSign", babyPatientExtendEarScreen.getPatientSign());
  1729 +
1727 1730 data.put("screenTypeStr", babyPatientExtendEarScreen.getScreenType() == 1 ? "初筛" : "复筛");//1= 2=
1728 1731 data.put("screenType", babyPatientExtendEarScreen.getScreenType());
1729 1732 data.put("checkHospitalId", babyPatientExtendEarScreen.getCheckHospitalId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java View file @ f768440
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.base.IBasicRequestConvert;
4 4 import com.lyms.platform.common.core.annotation.form.Form;
5 5 import com.lyms.platform.common.utils.DateUtil;
  6 +import com.lyms.platform.common.utils.StringUtils;
6 7 import com.lyms.platform.permission.model.BabyPatientExtendEarScreen;
7 8 import org.hibernate.validator.constraints.NotEmpty;
8 9  
... ... @@ -25,7 +26,10 @@
25 26 */
26 27 @Pattern(regexp = "^[2|1]$", message = "screenType 非法")
27 28 private Integer screenType;
28   -
  29 + //医生签名
  30 + private String doctorSign;
  31 + //患者签名
  32 + private String patientSign;
29 33 /**
30 34 * 检查医院的id
31 35 */
... ... @@ -130,6 +134,12 @@
130 134 @Override
131 135 public BabyPatientExtendEarScreen convertToDataModel() {
132 136 BabyPatientExtendEarScreen babyPatientExtendEarScreen = new BabyPatientExtendEarScreen();
  137 + if(StringUtils.isNotEmpty(patientSign)){
  138 + babyPatientExtendEarScreen.setPatientSign(patientSign);
  139 + }
  140 + if(StringUtils.isNotEmpty(doctorSign)){
  141 + babyPatientExtendEarScreen.setDoctorSign(doctorSign);
  142 + }
133 143 babyPatientExtendEarScreen.setGjb3Slc26a4Ivs7(gjb3Slc26a4Ivs7);
134 144 babyPatientExtendEarScreen.setProcessOptionType(processOptionType);
135 145 babyPatientExtendEarScreen.setProcessOptionDesc(processOptionDesc);
... ... @@ -315,6 +325,22 @@
315 325  
316 326 public void setNextCheckTime(String nextCheckTime) {
317 327 this.nextCheckTime = nextCheckTime;
  328 + }
  329 +
  330 + public String getDoctorSign() {
  331 + return doctorSign;
  332 + }
  333 +
  334 + public void setDoctorSign(String doctorSign) {
  335 + this.doctorSign = doctorSign;
  336 + }
  337 +
  338 + public String getPatientSign() {
  339 + return patientSign;
  340 + }
  341 +
  342 + public void setPatientSign(String patientSign) {
  343 + this.patientSign = patientSign;
318 344 }
319 345  
320 346 public String getId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java View file @ f768440
... ... @@ -15,6 +15,7 @@
15 15  
16 16 BaseResponse updateBaby(String startDate, String endDate);
17 17 BaseResponse addOrUpdate(Integer userId, BabyEyeCheck babyEyeCheck);
  18 + BaseResponse babyEyeCheckSign(String patientSign, String id);
18 19 BaseResponse addOrUpdateQhd(Integer userId, BabyEyeCheck babyEyeCheck);
19 20  
20 21 BaseResponse info(String id);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ f768440
... ... @@ -346,8 +346,23 @@
346 346  
347 347 return RespBuilder.buildSuccess(babyEyeCheck.getId());
348 348 }
349   -
350 349 /**
  350 + 眼保健检查 上传 患者签名
  351 + * @Author: 武涛涛
  352 + * @Date: 2020/12/16 11:09
  353 + */
  354 + public BaseResponse babyEyeCheckSign(String patientSign, String id) {
  355 + if (StringUtils.isNotEmpty(id)) {
  356 + BabyEyeCheck babyEyeCheck = new BabyEyeCheck();
  357 + babyEyeCheck.setPatientSign(patientSign);
  358 + Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyEyeCheck));
  359 + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), update, BabyEyeCheck.class);
  360 + }else {
  361 + return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
  362 + }
  363 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  364 + }
  365 + /**
351 366 * 检查冗余最后一次检查结果到儿童档案表中
352 367 *
353 368 * @param babyEyeCheck
... ... @@ -604,6 +619,9 @@
604 619 BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class);
605 620  
606 621 Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
  622 + map.put("doctorSign", babyEyeCheck.getDoctorSign());
  623 + map.put("patientSign", babyEyeCheck.getPatientSign());
  624 +
607 625 map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "qhz".equals(babyEyeCheck.getEyeMovementsId()) ? "欠合作" : "");
608 626 map.put("nystagmus", parseYinYang(babyEyeCheck.getNystagmus()));
609 627 map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));