jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 88e2ec2bc0e3b61f1cce7fde60bacb7112c8227f

Authored by yangfei
2 parents fef6c9feb5 baaa9af7fe
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 19 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java View file @ 88e2ec2
... ... @@ -232,6 +232,10 @@
232 232 */
233 233 private String acadLeft1kReflectThre;
234 234 /**
  235 + * 声导纳左耳226HZ声反射阀值
  236 + */
  237 + private String acadLeftReflectTTS;
  238 + /**
235 239 * 声导纳右耳曲线类型
236 240 */
237 241 private String acadRightCurveType;
... ... @@ -256,6 +260,10 @@
256 260 */
257 261 private String acadRight1kReflectThre;
258 262 /**
  263 + * 声导纳左耳226HZ声反射阀值
  264 + */
  265 + private String acadRightReflectTTS;
  266 + /**
259 267 * 声反射阀值左耳同侧500Hz
260 268 */
261 269 private String soundReflLeftIpsi500;
... ... @@ -1070,6 +1078,22 @@
1070 1078  
1071 1079 public void setSoundReflLeftOffsi500(String soundReflLeftOffsi500) {
1072 1080 this.soundReflLeftOffsi500 = soundReflLeftOffsi500;
  1081 + }
  1082 +
  1083 + public String getAcadLeftReflectTTS() {
  1084 + return acadLeftReflectTTS;
  1085 + }
  1086 +
  1087 + public void setAcadLeftReflectTTS(String acadLeftReflectTTS) {
  1088 + this.acadLeftReflectTTS = acadLeftReflectTTS;
  1089 + }
  1090 +
  1091 + public String getAcadRightReflectTTS() {
  1092 + return acadRightReflectTTS;
  1093 + }
  1094 +
  1095 + public void setAcadRightReflectTTS(String acadRightReflectTTS) {
  1096 + this.acadRightReflectTTS = acadRightReflectTTS;
1073 1097 }
1074 1098  
1075 1099 public String getSoundReflLeftOffsi1k() {
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml View file @ 88e2ec2
... ... @@ -57,12 +57,14 @@
57 57 <result column="acad_left_secondo_volume" property="acadLeftSecondoVolume" jdbcType="VARCHAR"/>
58 58 <result column="acad_left_gradient" property="acadLeftGradient" jdbcType="VARCHAR"/>
59 59 <result column="acad_left_1K_reflect_thre" property="acadLeft1kReflectThre" jdbcType="VARCHAR"/>
  60 + <result column="acad_left_reflect_tts" property="acadLeftReflectTTS" jdbcType="VARCHAR"/>
60 61 <result column="acad_right_curve_type" property="acadRightCurveType" jdbcType="VARCHAR"/>
61 62 <result column="acad_right_drum_cp" property="acadRightDrumCp" jdbcType="VARCHAR"/>
62 63 <result column="acad_right_acco" property="acadRightAcco" jdbcType="VARCHAR"/>
63 64 <result column="acad_right_secondo_volume" property="acadRightSecondoVolume" jdbcType="VARCHAR"/>
64 65 <result column="acad_right_gradient" property="acadRightGradient" jdbcType="VARCHAR"/>
65 66 <result column="acad_right_1K_reflect_thre" property="acadRight1kReflectThre" jdbcType="VARCHAR"/>
  67 + <result column="acad_right_reflect_tts" property="acadRightReflectTTS" jdbcType="VARCHAR"/>
66 68 <result column="sound_refl_left_ipsi_500" property="soundReflLeftIpsi500" jdbcType="VARCHAR"/>
67 69 <result column="sound_refl_left_ipsi_1k" property="soundReflLeftIpsi1k" jdbcType="VARCHAR"/>
68 70 <result column="sound_refl_left_ipsi_2k" property="soundReflLeftIpsi2k" jdbcType="VARCHAR"/>
... ... @@ -110,7 +112,7 @@
110 112  
111 113 <insert id="addBabyPatientExtendEarHearingDiagnose"
112 114 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnose">
113   -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_left_1K_reflect_thre,acad_right_curve_type,acad_right_drum_cp,acad_right_acco,acad_right_secondo_volume,acad_right_gradient,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) 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},#{acadLeft1kReflectThre},#{acadRightCurveType},#{acadRightDrumCp},#{acadRightAcco},#{acadRightSecondoVolume},#{acadRightGradient},#{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})
  115 +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) 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})
114 116 </insert>
115 117  
116 118  
... ... @@ -275,6 +277,10 @@
275 277 <if test="acadLeft1kReflectThre != null and acadLeft1kReflectThre != ''">
276 278 acad_left_1K_reflect_thre = #{acadLeft1kReflectThre,jdbcType=VARCHAR},
277 279 </if>
  280 + <if test="acadLeftReflectTTS != null and acadLeftReflectTTS != ''">
  281 + acad_left_reflect_tts = #{acadLeftReflectTTS,jdbcType=VARCHAR},
  282 + </if>
  283 +
278 284 <if test="acadRightCurveType != null and acadRightCurveType != ''">
279 285 acad_right_curve_type = #{acadRightCurveType,jdbcType=VARCHAR},
280 286 </if>
... ... @@ -293,6 +299,9 @@
293 299 <if test="acadRight1kReflectThre != null and acadRight1kReflectThre != ''">
294 300 acad_right_1K_reflect_thre = #{acadRight1kReflectThre,jdbcType=VARCHAR},
295 301 </if>
  302 + <if test="acadRightReflectTTS != null and acadRightReflectTTS != ''">
  303 + acad_right_reflect_tts = #{acadRightReflectTTS,jdbcType=VARCHAR},
  304 + </if>
296 305 <if test="soundReflLeftIpsi500 != null and soundReflLeftIpsi500 != ''">
297 306 sound_refl_left_ipsi_500 = #{soundReflLeftIpsi500,jdbcType=VARCHAR},
298 307 </if>
... ... @@ -431,7 +440,7 @@
431 440  
432 441 <select id="getBabyPatientExtendEarHearingDiagnose" resultMap="BabyPatientExtendEarHearingDiagnoseResultMap"
433 442 parameterType="java.lang.String">
434   -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_right_curve_type,acad_right_drum_cp,acad_right_acco,acad_right_secondo_volume,acad_right_gradient,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
  443 +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
435 444 from baby_patient_extend_ear_hearing_diagnose where id = #{id,jdbcType=VARCHAR}
436 445 </select>
437 446  
... ... @@ -785,7 +794,7 @@
785 794 <select id="queryBabyPatientExtendEarHearingDiagnose" resultMap="BabyPatientExtendEarHearingDiagnoseResultMap"
786 795 parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnoseQuery">
787 796 select
788   - 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_right_curve_type,acad_right_drum_cp,acad_right_acco,acad_right_secondo_volume,acad_right_gradient,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
  797 + 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
789 798 from baby_patient_extend_ear_hearing_diagnose
790 799 <include refid="BabyPatientExtendEarHearingDiagnoseCondition"/>
791 800 <include refid="orderAndLimit"/>
... ... @@ -922,7 +931,7 @@
922 931 AND
923 932 hd.isconfirm = #{isconfirm}
924 933 </if>
925   - <if test="isconfirm!=null">
  934 + <if test="confirmResult!=null">
926 935 and
927 936 hd.confirm_result like concat("%",#{confirmResult},"%")
928 937 </if>
platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java View file @ 88e2ec2
... ... @@ -7,21 +7,29 @@
7 7 * @discription
8 8 */
9 9 public enum HearingDiagnosisEnums {
10   - DEQDGYSJXL(1,"单耳轻度感音神经性聋"),
  10 + DEQDGYSJXLZE(1,"单耳轻度感音神经性聋(左耳)"),
  11 + DEQDGYSJXLYE(17,"单耳轻度感音神经性聋（右耳）"),
11 12 SEQDGYSJXL(2,"双耳轻度感音神经性聋"),
12   - DEQDCDXLHBZEY(3,"单耳轻度传导性聋合并中耳炎"),
  13 + DEQDCDXLHBZEYZE(3,"单耳轻度传导性聋合并中耳炎(左耳)"),
  14 + DEQDCDXLHBZEYYE(18,"单耳轻度传导性聋合并中耳炎（右耳）"),
13 15 SEQDCDXLHBZEY(4,"双耳轻度传导性聋合并中耳炎"),
14   - DEZDGYSJXL(5,"单耳中度感音神经性聋"),
  16 + DEZDGYSJXLZE(5,"单耳中度感音神经性聋(左耳)"),
  17 + DEZDGYSJXLYE(19,"单耳中度感音神经性聋（右耳）"),
15 18 SEZDGYSJXL(6,"双耳中度感音神经性聋"),
16   - DEZDCDXLHBZEY(7,"单耳中度传导性聋合并中耳炎"),
  19 + DEZDCDXLHBZEYZE(7,"单耳中度传导性聋合并中耳炎(左耳)"),
  20 + DEZDCDXLHBZEYYE(20,"单耳中度传导性聋合并中耳炎（右耳）"),
17 21 SEZDCDXLHBZEY(8,"双耳中度传导性聋合并中耳炎"),
18   - DEZZDGYSJXL(9,"单耳中重度感音神经性聋"),
  22 + DEZZDGYSJXLZE(9,"单耳中重度感音神经性聋(左耳)"),
  23 + DEZZDGYSJXLYE(21,"单耳中重度感音神经性聋（右耳）"),
19 24 SEZZDGYSJXL(10,"双耳中重度感音神经性聋"),
20   - DEZZDCDXLHBZEY(11,"单耳中重度传导性聋合并中耳炎"),
  25 + DEZZDCDXLHBZEYZE(11,"单耳中重度传导性聋合并中耳炎(左耳)"),
  26 + DEZZDCDXLHBZEYYE(22,"单耳中重度传导性聋合并中耳炎（右耳）"),
21 27 SEZZDCDXLHBZEY(12,"双耳中重度传导性聋合并中耳炎"),
22   - DEZZGYSJXL(13,"单耳重度感音神经性聋"),
  28 + DEZZGYSJXLZE(13,"单耳重度感音神经性聋(左耳)"),
  29 + DEZZGYSJXLYE(23,"单耳重度感音神经性聋（右耳）"),
23 30 SEZDGYSJXLS(14,"双耳重度感音神经性聋"),
24   - DEJZDGYSJXL(15,"单耳极重度感音神经性聋"),
  31 + DEJZDGYSJXLZE(15,"单耳极重度感音神经性聋(左耳)"),
  32 + DEJZDGYSJXLYE(24,"单耳极重度感音神经性聋（右耳）"),
25 33 SEJZDGYSJXL(16,"双耳极重度感音神经性聋");
26 34 private int id;
27 35 private String name;
platform-common/src/main/java/com/lyms/platform/common/enums/NextVisitTimeEnums.java View file @ 88e2ec2
... ... @@ -54,12 +54,12 @@
54 54 private Integer id;
55 55 private String name;
56 56  
57   - public static NextVisitTimeEnums getName(String id) {
  57 + public static String getName(String id) {
58 58 if(StringUtils.isNotEmpty(id)) {
59 59 NextVisitTimeEnums[] values = NextVisitTimeEnums.values();
60 60 for (NextVisitTimeEnums value : values) {
61 61 if (value.getId() == Integer.parseInt(id)) {
62   - return value;
  62 + return value.getName();
63 63 }
64 64 }
65 65 }
platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java View file @ 88e2ec2
... ... @@ -4,6 +4,7 @@
4 4 * Created by Administrator on 2017-01-18.
5 5 */
6 6  
  7 +import com.lyms.platform.common.pojo.SyncDataModel;
7 8 import org.apache.http.HttpEntity;
8 9 import org.apache.http.HttpResponse;
9 10 import org.apache.http.HttpStatus;
... ... @@ -171,6 +172,21 @@
171 172 }
172 173 }
173 174 return httpStr;
  175 + }
  176 +
  177 + public static void main(String[] args) throws Exception {
  178 +
  179 + Map<String,String> map = new HashMap<String, String>();
  180 + map.put("patientIds","59687f1de4b0b4e56acd1f81");
  181 + map.put("page","1");
  182 + map.put("limit","10");
  183 + long start = System.currentTimeMillis();
  184 + String s = doGet("https://area-lc-api.healthbaby.com.cn:55581/getAppLis", map, "utf-8","3d19960bf3e81e7d816c4f26051c49ba");
  185 +
  186 + List<SyncDataModel> list = JsonUtil.toList(s, SyncDataModel.class);
  187 + long end = System.currentTimeMillis();
  188 + System.out.print(end -start);
  189 + System.out.println(s);
174 190 }
175 191 }
platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java View file @ 88e2ec2
... ... @@ -24,8 +24,6 @@
24 24  
25 25 private String hospitalId;
26 26  
27   - private String parentId;
28   -
29 27 private String babyId;
30 28  
31 29 private String pid;
... ... @@ -192,14 +190,6 @@
192 190  
193 191 public void setHospitalId(String hospitalId) {
194 192 this.hospitalId = hospitalId;
195   - }
196   -
197   - public String getParentId() {
198   - return parentId;
199   - }
200   -
201   - public void setParentId(String parentId) {
202   - this.parentId = parentId;
203 193 }
204 194  
205 195 public String getBabyId() {
platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java View file @ 88e2ec2
... ... @@ -171,5 +171,24 @@
171 171 public void setYn(Integer yn) {
172 172 this.yn = yn;
173 173 }
  174 +
  175 + @Override
  176 + public String toString() {
  177 + return "SmsConfigModel{" +
  178 + "id='" + id + '\'' +
  179 + ", prefixType=" + prefixType +
  180 + ", hospitalPrefix='" + hospitalPrefix + '\'' +
  181 + ", deptPrefix='" + deptPrefix + '\'' +
  182 + ", guideTime='" + guideTime + '\'' +
  183 + ", smsService='" + smsService + '\'' +
  184 + ", created=" + created +
  185 + ", modified=" + modified +
  186 + ", createId='" + createId + '\'' +
  187 + ", yn=" + yn +
  188 + ", hospitalId='" + hospitalId + '\'' +
  189 + ", highConfig='" + highConfig + '\'' +
  190 + ", remark='" + remark + '\'' +
  191 + '}';
  192 + }
174 193 }
platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java View file @ 88e2ec2
... ... @@ -206,5 +206,26 @@
206 206 public void setModified(Date modified) {
207 207 this.modified = modified;
208 208 }
  209 +
  210 + @Override
  211 + public String toString() {
  212 + return "SmsTemplateModel{" +
  213 + "id='" + id + '\'' +
  214 + ", serviceObj=" + serviceObj +
  215 + ", serviceType=" + serviceType +
  216 + ", serviceStatus=" + serviceStatus +
  217 + ", smsType=" + smsType +
  218 + ", sendFrequency=" + sendFrequency +
  219 + ", sendDateType=" + sendDateType +
  220 + ", sendDate=" + sendDate +
  221 + ", specialDateType=" + specialDateType +
  222 + ", start=" + start +
  223 + ", end=" + end +
  224 + ", sendTimeType=" + sendTimeType +
  225 + ", hospitalId='" + hospitalId + '\'' +
  226 + ", status=" + status +
  227 + ", yn=" + yn +
  228 + '}';
  229 + }
209 230 }
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java View file @ 88e2ec2
... ... @@ -14,6 +14,8 @@
14 14 import net.sf.json.JSONArray;
15 15 import net.sf.json.JSONObject;
16 16 import org.apache.commons.httpclient.HttpClient;
  17 +import org.slf4j.Logger;
  18 +import org.slf4j.LoggerFactory;
17 19  
18 20 import java.util.*;
19 21  
... ... @@ -22,6 +24,7 @@
22 24 */
23 25 public class SaveMessageService {
24 26  
  27 + private static final Logger resultLog = LoggerFactory.getLogger("GEN-RESULT");
25 28  
26 29 /**
27 30 * 保存推送消息到消息中心
... ... @@ -31,6 +34,7 @@
31 34 public static boolean saveMsgCenter(MessageListRequest list)
32 35 {
33 36 String json = JsonUtil.obj2JsonString(list);
  37 + resultLog.info(json);
34 38 String result = HttpClientUtil.doPostSSL(ConfigInterface.CENTER_BASE_URL+"/biz-push-web/push",json);
35 39 if (StringUtils.isNotEmpty(result))
36 40 {
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java View file @ 88e2ec2
... ... @@ -55,6 +55,7 @@
55 55 public void generatePatAmsMsg(String generateHospitalId) {
56 56 String week = DateUtils.getWeekOfDate(new Date());
57 57 List<SmsConfigModel> configModels = baseService.getHospitalConfigsByWeek(generateHospitalId);
  58 + logger.info("The configs hospital size is {}",configModels.size());
58 59 if (CollectionUtils.isNotEmpty(configModels))
59 60 {
60 61 int batchSize = 5;
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java View file @ 88e2ec2
... ... @@ -31,71 +31,12 @@
31 31 public static final String Y_M_D_H_M_S = "yyyy-MM-dd HH:mm:ss";
32 32 public static final String Y_M_D_H_M = "yyyy-MM-dd HH:mm";
33 33  
34   -// private static Map<String, ThreadLocal<SimpleDateFormat>> formatMap = new HashMap<String, ThreadLocal<SimpleDateFormat>>();
35   -
36   - private static ThreadLocal<SimpleDateFormat> threadLocal = new ThreadLocal<SimpleDateFormat>(){
37   - @Override
38   - protected SimpleDateFormat initialValue() {
39   - return new SimpleDateFormat(Y_M_D_H_M_S);
40   - }
41   - };
42   -
43 34 private static final String[] weekDays = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
44 35  
45 36  
46   - /**
47   - * 为每个线程创建一个时间格式化实例
48   - * @param dateFormat
49   - * @return
50   - */
51   - private static SimpleDateFormat getDateFormat(String dateFormat)
52   - {
53   - SimpleDateFormat simpleDateFormat = threadLocal.get();
54   - if (simpleDateFormat == null)
55   - {
56   - simpleDateFormat = new SimpleDateFormat(dateFormat);
57   - threadLocal.set(simpleDateFormat);
58   - }
59   - simpleDateFormat.applyPattern(dateFormat);
60   - return simpleDateFormat;
61   - }
  37 + private static SimpleDateFormat dateFormat = new SimpleDateFormat(Y_M_D_H_M_S);
62 38  
63 39  
64   -// /**
65   -// * 为每个线程创建一个时间格式化实例
66   -// * @param dateFormat
67   -// * @return
68   -// */
69   -// private static SimpleDateFormat getDateFormat(final String dateFormat)
70   -// {
71   -// try {
72   -// ThreadLocal<SimpleDateFormat> tl = formatMap.get(dateFormat);
73   -// if (tl == null)
74   -// {
75   -// lock.lock();
76   -// tl = formatMap.get(dateFormat);
77   -// if (tl == null)
78   -// {
79   -// tl = new ThreadLocal<SimpleDateFormat>()
80   -// {
81   -// @Override
82   -// protected SimpleDateFormat initialValue()
83   -// {
84   -// return new SimpleDateFormat(dateFormat);
85   -// }
86   -// };
87   -// formatMap.put(dateFormat, tl);
88   -// }
89   -// }
90   -// return tl.get();
91   -// }
92   -// finally
93   -// {
94   -// lock.unlock();
95   -// }
96   -//
97   -// }
98   -
99 40 /**
100 41 * 获取当前日期是星期几<br>
101 42 *
102 43  
103 44  
... ... @@ -129,19 +70,21 @@
129 70 */
130 71 public static String getDateStr(Date date,String format)
131 72 {
132   - if (date == null)
133   - {
134   - return null;
135   - }
136 73 try
137 74 {
138   - return getDateFormat(format).format(date);
  75 + lock.lock();
  76 + dateFormat.applyPattern(format);
  77 + return dateFormat.format(date);
139 78 }
140 79 catch (Exception e)
141 80 {
142 81 logger.error("get date format error.");
143 82 return null;
144 83 }
  84 + finally {
  85 + lock.unlock();
  86 + }
  87 +
145 88 }
146 89  
147 90  
... ... @@ -153,8 +96,20 @@
153 96 */
154 97 public static Date formatDate(Date date,String format)
155 98 {
156   - String time = getDateFormat(format).format(date);
157   - return preaseDate(time, format);
  99 + try {
  100 + lock.lock();
  101 + dateFormat.applyPattern(format);
  102 + String time =dateFormat.format(date);
  103 + return dateFormat.parse(time);
  104 + }
  105 + catch (Exception e)
  106 + {
  107 + e.printStackTrace();
  108 + }
  109 + finally {
  110 + lock.unlock();
  111 + }
  112 + return null;
158 113 }
159 114  
160 115 /**
161 116  
... ... @@ -167,10 +122,14 @@
167 122 {
168 123 try
169 124 {
170   - Date date = getDateFormat(format).parse(dateStr);
171   - return date;
  125 + lock.lock();
  126 + dateFormat.applyPattern(format);
  127 + return dateFormat.parse(dateStr);
172 128 } catch (ParseException e) {
173 129 e.printStackTrace();
  130 + }
  131 + finally {
  132 + lock.unlock();
174 133 }
175 134 return null;
176 135 }
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java View file @ 88e2ec2
... ... @@ -15,7 +15,6 @@
15 15 import org.slf4j.Logger;
16 16 import org.slf4j.LoggerFactory;
17 17  
18   -import java.util.Calendar;
19 18 import java.util.Date;
20 19 import java.util.List;
21 20 import java.util.Map;
... ... @@ -26,6 +25,7 @@
26 25 public class HelperUtils {
27 26  
28 27 private static final Logger logger = LoggerFactory.getLogger(HelperUtils.class);
  28 + private static final Logger resultLog = LoggerFactory.getLogger("GEN-RESULT");
29 29  
30 30 public static int getWeekNum(List<String> guideTimes,String week)
31 31 {
... ... @@ -80,7 +80,7 @@
80 80 request.setKeyword2(keyWord2);
81 81 request.setRemark(remark);
82 82  
83   - logger.info("msg info = "+request.toString());
  83 +// resultLog.info("msg result = "+request.toString());
84 84  
85 85 return request;
86 86 }
... ... @@ -268,7 +268,7 @@
268 268 if (end > msgs.size()) {
269 269 end = msgs.size();
270 270 }
271   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"start:" + i + ",end:" + end);
  271 + logger.info("start:" + i + ",end:" + end);
272 272 List<MessageRequest> tempList = msgs.subList(i, end);
273 273 MessageListRequest sentList = new MessageListRequest();
274 274 sentList.setMessages(tempList);
... ... @@ -279,6 +279,17 @@
279 279 }
280 280 }
281 281  
  282 +
  283 + /**
  284 + * 是否已经生成过消息
  285 + * @param patientId
  286 + * @param tempId
  287 + * @return
  288 + */
  289 + public static boolean isExistMsg(String patientId,String tempId)
  290 + {
  291 + return SaveMessageService.isExistMsg(patientId,tempId);
  292 + }
282 293  
283 294 /**
284 295 * 儿童服务状态和服务类型条件
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ 88e2ec2
... ... @@ -20,18 +20,18 @@
20 20 import org.slf4j.LoggerFactory;
21 21  
22 22 import java.util.*;
  23 +import java.util.concurrent.ExecutorService;
  24 +import java.util.concurrent.Executors;
23 25  
24 26 /**
25 27 * Created by lqy on 2017-07-18.
26 28 */
27 29 public class TempleteMsgGenerateWorker implements Runnable {
28 30  
29   -
30 31 private static final Logger logger = LoggerFactory.getLogger(TempleteMsgGenerateWorker.class);
31   - private static final Logger errorLogger = LoggerFactory.getLogger("Error");
32 32  
  33 + private static ExecutorService pool = Executors.newFixedThreadPool(10);
33 34  
34   -
35 35 private List<SmsConfigModel> configs;
36 36  
37 37 private IBaseService baseService;
38 38  
... ... @@ -66,9 +66,9 @@
66 66 //启用状态 0未启用 1启用
67 67 tempQuery.setStatus(1);
68 68  
69   - for(SmsConfigModel config : configs) {
70   -
  69 + for(final SmsConfigModel config : configs) {
71 70 String hospitalId = config.getHospitalId();
  71 + logger.info("genernate tempplate hospital id = "+hospitalId);
72 72 if (StringUtils.isEmpty(hospitalId))
73 73 {
74 74 continue;
75 75  
76 76  
77 77  
78 78  
79 79  
80 80  
81 81  
82 82  
... ... @@ -89,48 +89,72 @@
89 89 continue;
90 90 }
91 91 try {
92   - //循环每一个模板，根据模板条件查询到用户 发送短信
93   - for (SmsTemplateModel template : templates)
94   - {
95 92  
96   - //模板属于的医院id
97   - String tempHid = template.getHospitalId();
98   - //服务对象1孕妇 2儿童 3产妇
99   - Integer serviceObj = template.getServiceObj();
  93 + int batchSize = 5;
  94 + int end = 0;
  95 + for (int i = 0; i < templates.size(); i += batchSize) {
  96 + end = (end + batchSize);
  97 + if (end > templates.size()) {
  98 + end = templates.size();
  99 + }
  100 + final List<SmsTemplateModel> items = templates.subList(i, end);
  101 + pool.submit(new Runnable() {
  102 + @Override
  103 + public void run() {
100 104  
101   - //消息类型
102   - Integer smsType = template.getSmsType();
  105 + //循环每一个模板，根据模板条件查询到用户 发送短信
  106 + for (SmsTemplateModel template : items)
  107 + {
  108 + try {
  109 + //模板属于的医院id
  110 + String tempHid = template.getHospitalId();
  111 + //服务对象1孕妇 2儿童 3产妇
  112 + Integer serviceObj = template.getServiceObj();
103 113  
104   - if (tempHid == null || serviceObj == null) {
105   - continue;
106   - }
  114 + //消息类型
  115 + Integer smsType = template.getSmsType();
107 116  
108   - //false 表示该服务没有启动 smsType为消息类型
109   - boolean isStart = HelperUtils.isStartTemplate(config, smsType);
110   - if (!isStart) {
111   - continue;
112   - }
  117 + if (tempHid == null || serviceObj == null) {
  118 + continue;
  119 + }
113 120  
114   - //孕妇
115   - if (serviceObj == ServiceObjEnums.YUNOBJ.getId())
116   - {
117   - generateYunTempMsg(template,config);
118   - }
119   - //儿童
120   - else if (serviceObj == ServiceObjEnums.BABYOBJ.getId())
121   - {
122   - generateChildTempMsg(template, config);
123   - }
124   - //产妇
125   - else if (serviceObj == ServiceObjEnums.CHANOBJ.getId())
126   - {
  121 + //false 表示该服务没有启动 smsType为消息类型
  122 + boolean isStart = HelperUtils.isStartTemplate(config, smsType);
  123 + if (!isStart) {
  124 + continue;
  125 + }
127 126  
128   - }
  127 + //孕妇
  128 + if (serviceObj == ServiceObjEnums.YUNOBJ.getId())
  129 + {
  130 + generateYunTempMsg(template,config);
  131 + }
  132 + //儿童
  133 + else if (serviceObj == ServiceObjEnums.BABYOBJ.getId())
  134 + {
  135 + generateChildTempMsg(template, config);
  136 + }
  137 + //产妇
  138 + else if (serviceObj == ServiceObjEnums.CHANOBJ.getId())
  139 + {
  140 +
  141 + }
  142 + }
  143 + catch (Exception e)
  144 + {
  145 + ExceptionUtils.catchException(e,"genernate templete error. ["+template.toString()+"]");
  146 + continue;
  147 + }
  148 + }
  149 + }
  150 + });
129 151 }
  152 +
  153 +
130 154 }
131 155 catch (Exception e)
132 156 {
133   - ExceptionUtils.catchException(e,"gen templete error.");
  157 + ExceptionUtils.catchException(e,"genernate config error.["+config.toString()+"]");
134 158 continue;
135 159 }
136 160 }
137 161  
138 162  
... ... @@ -251,13 +275,18 @@
251 275 {
252 276 continue;
253 277 }
  278 + if (HelperUtils.isExistMsg(model.getId(), template.getId()))
  279 + {
  280 + continue;
  281 + }
254 282  
255 283 //如果有有效的预约短信就不发送 儿保检查提醒
256   - if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(),"天"))
  284 + if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(), "天"))
257 285 {
258 286 continue;
259 287 }
260 288  
  289 +
261 290 //短信前缀
262 291 String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor());
263 292 String messageContent = "【"+messagePrefix+"】"+template.getContent();
264 293  
... ... @@ -301,8 +330,13 @@
301 330 continue;
302 331 }
303 332  
  333 + if (HelperUtils.isExistMsg(model.getId(),template.getId()))
  334 + {
  335 + continue;
  336 + }
  337 +
304 338 //如果有有效的预约短信就不发送 儿保检查提醒
305   - if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(),"月"))
  339 + if (queryBabyOrder(model.getBirth(), start, tempHid, sendTimeType, model.getId(), "月"))
306 340 {
307 341 continue;
308 342 }
... ... @@ -470,6 +504,10 @@
470 504 {
471 505 for (Patients pat : patients)
472 506 {
  507 + if (HelperUtils.isExistMsg(pat.getId(),template.getId()))
  508 + {
  509 + continue;
  510 + }
473 511  
474 512 //如果有有效的预约短信就不发送产检程序提醒
475 513 boolean isOrder = baseService.queryYunIsOrder(sendTimeType, tempHid, pat.getId(), pat.getLastMenses(), start);
... ... @@ -477,6 +515,7 @@
477 515 {
478 516 continue;
479 517 }
  518 +
480 519 //短信前缀
481 520 String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor());
482 521 String messageContent = "【"+messagePrefix+"】"+template.getContent();
platform-msg-generate/src/main/resources/spring/applicationContext_biz_patient.xml View file @ 88e2ec2
... ... @@ -26,36 +26,36 @@
26 26 </property>
27 27 </bean>
28 28 <!--自动代理dao层 -->
29   - <bean
30   - class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator" id="autoProxyCreator">
31   - <property name="beanNames" value="*Dao" />
32   - <property name="interceptorNames">
33   - <list>
34   - <value>dalInterceptor</value>
35   - </list>
36   - </property>
37   - </bean>
  29 + <!--<bean-->
  30 + <!--class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator" id="autoProxyCreator">-->
  31 + <!--<property name="beanNames" value="*Dao" />-->
  32 + <!--<property name="interceptorNames">-->
  33 + <!--<list>-->
  34 + <!--<value>dalInterceptor</value>-->
  35 + <!--</list>-->
  36 + <!--</property>-->
  37 + <!--</bean>-->
38 38  
39   - <bean
40   - class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator" id="nameAutoProxyCreator">
41   - <property name="beanNames" value="*Mapper" />
42   - <property name="interceptorNames">
43   - <list>
44   - <value>mysqlDalInterceptor</value>
45   - </list>
46   - </property>
47   - </bean>
  39 + <!--<bean-->
  40 + <!--class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator" id="nameAutoProxyCreator">-->
  41 + <!--<property name="beanNames" value="*Mapper" />-->
  42 + <!--<property name="interceptorNames">-->
  43 + <!--<list>-->
  44 + <!--<value>mysqlDalInterceptor</value>-->
  45 + <!--</list>-->
  46 + <!--</property>-->
  47 + <!--</bean>-->
48 48  
49 49 <!-- dal层方法性能统计-->
50   - <bean id="mysqlDalInterceptor"
51   - class="com.lyms.platform.common.perf.DalMethodInterceptor">
52   - <property name="threshold" value="30" />
53   - </bean>
  50 + <!--<bean id="mysqlDalInterceptor"-->
  51 + <!--class="com.lyms.platform.common.perf.DalMethodInterceptor">-->
  52 + <!--<property name="threshold" value="30" />-->
  53 + <!--</bean>-->
54 54 <!-- dal层方法性能统计-->
55   - <bean id="dalInterceptor"
56   - class="com.lyms.platform.common.perf.DalMethodInterceptor">
57   - <property name="threshold" value="10" />
58   - </bean>
  55 + <!--<bean id="dalInterceptor"-->
  56 + <!--class="com.lyms.platform.common.perf.DalMethodInterceptor">-->
  57 + <!--<property name="threshold" value="10" />-->
  58 + <!--</bean> -->
59 59  
60 60 <import resource="spring-mongodb.xml" />
61 61 </beans>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 88e2ec2
... ... @@ -349,10 +349,6 @@
349 349 //设置要查询的babyId
350 350 query.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
351 351  
352   - if (hdReq.getConfirmResult() != null) {
353   - query.setConfirmResult(String.valueOf(hdReq.getConfirmResult()));
354   - }
355   -
356 352 if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间
357 353 query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime());
358 354 }
... ... @@ -377,7 +373,7 @@
377 373 if (hdReq.getIsconfirm() != null) {//是否确诊 0-未确诊 1-确诊
378 374 query.setIsconfirm(hdReq.getIsconfirm());
379 375 }
380   - if (hdReq.getConfirmDegree() != null) {//模糊查询确诊结果
  376 + if (hdReq.getConfirmDegree() != null) {//模糊查询确诊程度
381 377 List<String> cfList = new ArrayList<>();
382 378 if (hdReq.getConfirmDegree() == 1) {//轻度
383 379 cfList.add(",1,");
... ... @@ -387,7 +383,7 @@
387 383 cfList.add(",4,");
388 384 cfList.add(",5,");
389 385 cfList.add(",6,");
390   - } else if (hdReq.getConfirmDegree() == 3) {//重度
  386 + } else if (hdReq.getConfirmDegree() == 3) {//中重度和重度
391 387 cfList.add(",7,");
392 388 cfList.add(",8,");
393 389 cfList.add(",9,");
394 390  
... ... @@ -400,8 +396,33 @@
400 396 cfList.add(",15,");
401 397 }
402 398 query.setConfirmResults(cfList.toArray(new String[cfList.size()]));
403   - // query.setConfirmResult("," + hdReq.getConfirmResult() + ",");
404 399 }
  400 +
  401 + if (hdReq.getConfirmResult() != null) {
  402 + List<String> cfList = new ArrayList<>();
  403 + if (hdReq.getConfirmResult() == 1) {//轻度
  404 + cfList.add(",1,");
  405 + cfList.add(",2,");
  406 + cfList.add(",3,");
  407 + } else if (hdReq.getConfirmResult() == 2) {//中度
  408 + cfList.add(",4,");
  409 + cfList.add(",5,");
  410 + cfList.add(",6,");
  411 + } else if (hdReq.getConfirmResult() == 3) {//中重度和重度
  412 + cfList.add(",7,");
  413 + cfList.add(",8,");
  414 + cfList.add(",9,");
  415 + cfList.add(",10,");
  416 + cfList.add(",11,");
  417 + cfList.add(",12,");
  418 + } else if (hdReq.getConfirmResult() == 4) {//极重度
  419 + cfList.add(",13,");
  420 + cfList.add(",14,");
  421 + cfList.add(",15,");
  422 + }
  423 + query.setConfirmResults(cfList.toArray(new String[cfList.size()]));
  424 + }
  425 +
405 426  
406 427 if (hdReq.getConfirmStartTime() != null) {//确诊开始时间
407 428 query.setConfirmStartTime(hdReq.getConfirmStartTime());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 88e2ec2
... ... @@ -162,15 +162,17 @@
162 162 }else{
163 163  
164 164 List<CheckResponse> result = new ArrayList<CheckResponse>();
165   - if("7".equals(HIS_VERSION)){
166   - //根据调用接口获取四川南充中心医院的Lis数据
167   - result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo));
168   - }else if("6".equals(HIS_VERSION)){
169   - //调用德州妇幼lis接口
170   - result.addAll(DzfyHisService.queryLisCheckList(vcCardNo));
171   - }else{
172   - result.addAll(queryLisCheckList(vcCardNo,phone,userId));
173   - }
  165 +// if("7".equals(HIS_VERSION)){
  166 +// //根据调用接口获取四川南充中心医院的Lis数据
  167 +// result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo));
  168 +// }else if("6".equals(HIS_VERSION)){
  169 +// //调用德州妇幼lis接口
  170 +// result.addAll(DzfyHisService.queryLisCheckList(vcCardNo));
  171 +// }else{
  172 +// result.addAll(queryLisCheckList(vcCardNo,phone,userId));
  173 +// }
  174 +
  175 + result.addAll(queryLisCheckList(vcCardNo,phone,userId));
174 176  
175 177 //result.addAll(queryPacsCheckList(cardNo));
176 178 List<String> keyList = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 88e2ec2
... ... @@ -84,6 +84,10 @@
84 84 newbornVisit.setOperationId(userId.toString());
85 85 newbornVisit.setCreated(new Date());
86 86 newbornVisit.setYn("1");
  87 + BabyModel babyModel = mongoTemplate.findById(newbornVisit.getBabyId(), BabyModel.class);
  88 + if(babyModel != null) {
  89 + newbornVisit.setPid(babyModel.getPid());
  90 + }
87 91 mongoTemplate.save(newbornVisit);
88 92 return RespBuilder.buildSuccess(newbornVisit.getId());
89 93 } else {
90 94  
91 95  
... ... @@ -147,13 +151,24 @@
147 151 if(StringUtils.isNotBlank(doctor)) {
148 152 criteria.and("doctor").is(doctor);
149 153 }
  154 + if(StringUtils.isNotBlank(key)) {
  155 + Criteria c = new Criteria();
  156 + c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);
  157 + List<BabyModel> babyModels = mongoUtil.findField(BabyModel.class, c, "id");
  158 + if(CollectionUtils.isNotEmpty(babyModels)) {
  159 + List<String> babyIds = CollectionUtils.getId(babyModels, "id", String.class);
  160 + criteria.and("babyId").in(babyIds);
  161 + }
  162 + }
150 163 PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria), page, limit);
151 164 List<NewbornVisit> newbornVisits = (List<NewbornVisit>) pageResult.getGrid();
152 165 List<Map<String, Object>> restMap = new ArrayList<>();
153 166 for (NewbornVisit visit : newbornVisits) {
154 167 Map<String, Object> temp = new HashMap<>();
155   -
156 168 temp.put("checkTime", visit.getCheckTime() == null ? null : DateUtil.getyyyy_MM_dd(visit.getCheckTime())); // 复查访视时间
  169 + temp.put("id", visit.getId());
  170 + temp.put("pid", visit.getPid());
  171 + temp.put("babyId", visit.getBabyId());
157 172 String pid = visit.getPid();
158 173 if(StringUtils.isNotBlank(pid)) {
159 174 PersonModel person = mongoTemplate.findById(pid, PersonModel.class);
160 175  
161 176  
162 177  
163 178  
... ... @@ -163,19 +178,30 @@
163 178 temp.put("age", DateUtil.getAge(person.getBirth()));
164 179 temp.put("phone", person.getPhone());
165 180 }
166   - Patients patients = mongoTemplate.findById(visit.getParentId(), Patients.class);
  181 + }
  182 + BabyModel babyModel = mongoTemplate.findById(visit.getBabyId(), BabyModel.class);
  183 + if(babyModel != null) {
  184 + Patients patients = mongoTemplate.findById(babyModel.getParentId(), Patients.class);
167 185 if(patients != null) {
168 186 int days = DateUtil.daysBetween(patients.getFmDate(), new Date());
169   - temp.put("days", "产后"+days+"天");
  187 + temp.put("days", days);
170 188 }
171   - temp.put("count", mongoTemplate.count(new Query(criteria), NewbornVisit.class));
172   - temp.put("benyuan", mongoTemplate.count(new Query(criteria.and("visitHositalId").is(hospitalId)), NewbornVisit.class));
173   -// Users users = mapper.getUsers(Integer.parseInt(visit.getDoctor()));
174   -// temp.put("doctorName", users == null ? null : users.getName());
175 189 }
176   -
  190 + List<NewbornVisit> nvs = mongoTemplate.find(new Query(criteria), NewbornVisit.class);
  191 + temp.put("count", nvs.size());
  192 + int benyuan = 0;
  193 + for (NewbornVisit nv : nvs) {
  194 + if(hospitalId.equals(nv.getVisitHospitalId())) {
  195 + benyuan++;
  196 + }
  197 + }
  198 + temp.put("benyuan", benyuan);
  199 + restMap.add(temp);
  200 + String doctorName = mapper.getUserName(visit.getDoctor());
  201 + temp.put("doctorName", doctorName);
177 202 }
178   - return RespBuilder.buildSuccess(newbornVisits);
  203 + pageResult.setGrid(restMap);
  204 + return RespBuilder.buildSuccess(pageResult);
179 205 }
180 206  
181 207 @Override
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java View file @ 88e2ec2
... ... @@ -171,19 +171,5 @@
171 171 return json1;
172 172 }
173 173  
174   -
175   -
176   -
177   -
178   - public static void main(String[] args) throws Exception {
179   -
180   - long start = System.currentTimeMillis();
181   - String s = doPost("https://area-qhd-api.healthbaby.com.cn:18019/findSyncData", new HashMap<String, String>(), "utf-8");
182   -
183   - List<SyncDataModel> list = JsonUtil.toList(s, SyncDataModel.class);
184   - long end = System.currentTimeMillis();
185   - System.out.print(end -start);
186   - System.out.println(s);
187   - }
188 174 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ 88e2ec2
... ... @@ -249,7 +249,7 @@
249 249 // map.setList(JsonUtil.toList(list, SmsObj.class));
250 250 // System.out.print(map);
251 251  
252   - queryMsgList("1", null,null,
  252 + queryMsgList("216", null,null,
253 253 null,null,
254 254 null,null,
255 255 null,null ,