diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java index 5fe3707..aadcb03 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBaby.java @@ -21,6 +21,15 @@ public class BabyPatientExtendEarBaby { private Date buildDate; private String babyPatientId; private String babyEarId; + private String personId; + + public String getPersonId() { + return personId; + } + + public void setPersonId(String personId) { + this.personId = personId; + } public String getId() { return id; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java index 09245bf..71bd676 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java @@ -22,12 +22,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { private String hospitalId; private Integer buildType; private String enable; + private String noEnable; private Integer yn; private Date buildDate; private String babyPatientId; private String babyEarId; //儿童姓名、母亲证件号、母亲联系方式 private String queryNo; + private String personId; /** * 生日 */ @@ -37,6 +39,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { */ private Date birthEnd; + public String getPersonId() { + return personId; + } + + public void setPersonId(String personId) { + this.personId = personId; + } + public Date getBirthStart() { return birthStart; } @@ -53,6 +63,14 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { this.birthEnd = birthEnd; } + public String getNoEnable() { + return noEnable; + } + + public void setNoEnable(String noEnable) { + this.noEnable = noEnable; + } + public String getId() { return id; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java index 0d8476f..42a28fc 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java @@ -133,7 +133,15 @@ public class BabyPatientExtendEarFollowUp extends AbstracUuidEntity{ * 状态 */ private Integer enalble; + private String pid; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } public Integer getIsAudiphone() { return isAudiphone; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java index e7c6d2f..d40baf8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java @@ -119,6 +119,7 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery { * 创建人id */ private String createId; + private String pid; /** * 状态 */ @@ -139,6 +140,14 @@ public class BabyPatientExtendEarFollowUpQuery extends BaseQuery { //获取sql语句 private String sqlStr; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Integer getIsAudiphone() { return isAudiphone; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java index 9d6898e..1a8b191 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java @@ -480,6 +480,15 @@ public class BabyPatientExtendEarHearingDiagnose implements Comparable { * 确诊时间 */ private String confirmTimeStr; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } public String getMonthAge() { return monthAge; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java index aa45a08..4cf1273 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java @@ -436,6 +436,8 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery { * 确诊结果 */ private String confirmResult; + private String pid; + private String[] pids; /** * 确诊结果程度 */ @@ -453,6 +455,22 @@ public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery { */ private Date confirmEndTime; + public String[] getPids() { + return pids; + } + + public void setPids(String[] pids) { + this.pids = pids; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String[] getConfirmResults() { return confirmResults; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java index d35bef6..85abc2c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java @@ -53,6 +53,15 @@ public class BabyPatientExtendEarQuery extends BaseQuery private String createUserId; //条码 private String barCode; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } public String getNation() { return nation; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java index 3d1a97f..ad3e829 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java @@ -107,6 +107,8 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { * 预约诊断时间 */ private Date nextCheckTime; + //pid + private String pid; private Date createDate; private String createUserId; @@ -116,6 +118,14 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { private String lastUpdateHospitalId; private Integer status; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Integer getScrIspass() { return scrIspass; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java index d0ef3d9..b57d176 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java @@ -129,6 +129,7 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { private String nextStartTime; //预约复查结束时间 private String nextEndTime; + private String pid; //筛查结果 -1未通过 1-通过 private Integer isPass; @@ -140,6 +141,13 @@ public class BabyPatientExtendEarScreenQuery extends BaseQuery { //筛查结果 1通过 2-未通过 private Integer scrIspass; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } public Integer getScrIspass() { return scrIspass; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java index 3d2d009..daf0e74 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospital.java @@ -74,6 +74,15 @@ public class HighriskChangeHospital { * 听筛记录ID */ private String scrreenId; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } public String getScrreenId() { return scrreenId; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java index 4b8e48f..0a42c58 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java @@ -88,9 +88,18 @@ public class HighriskChangeHospitalQuery extends BaseQuery { * 听筛记录ID */ private String scrreenId; + private String pid; //听诊儿童档案集合 private String[] babyIds; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String[] getBabyIds() { return babyIds; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml index baaf434..a215590 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml @@ -22,12 +22,13 @@ + -insert into baby_patient_extend_ear_baby (id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id) values (#{id},#{name},#{sex},#{cardno},#{birth},#{mname},#{mcertTypeId},#{mcertNo},#{mphone},#{vcCardNo},#{buildDoctor},#{hospitalId},#{buildType},#{enable},#{yn},#{buildDate},#{babyPatientId},#{babyEarId}) +insert into baby_patient_extend_ear_baby (id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,build_doctor,hospital_id,build_type,enable,yn,build_date,baby_patient_id,baby_ear_id,person_id) values (#{id},#{name},#{sex},#{cardno},#{birth},#{mname},#{mcertTypeId},#{mcertNo},#{mphone},#{vcCardNo},#{buildDoctor},#{hospitalId},#{buildType},#{enable},#{yn},#{buildDate},#{babyPatientId},#{babyEarId},#{personId}) @@ -86,6 +87,9 @@ insert into baby_patient_extend_ear_baby (id,name,sex,cardNo,birth,mname,mcert_t baby_ear_id = #{babyEarId,jdbcType=VARCHAR}, + + person_id = #{personId,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -98,7 +102,7 @@ delete from baby_patient_extend_ear_baby where id = #{id,jdbcType=VARCHAR} @@ -179,7 +183,14 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b and build_type = #{buildType,jdbcType=INTEGER} - and enable = #{enable,jdbcType=VARCHAR} + and (enable = #{enable,jdbcType=VARCHAR} + or `enable` is null + ) + + + and (enable != #{noEnable,jdbcType=VARCHAR} + or `enable` is null + ) and yn = #{yn,jdbcType=INTEGER} @@ -193,6 +204,10 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b and baby_ear_id = #{babyEarId,jdbcType=VARCHAR} + + and person_id = #{personId,jdbcType=VARCHAR} + + @@ -200,7 +215,7 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b -select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble +select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,month_age,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble,pid from baby_patient_extend_ear_follow_up where id = #{id,jdbcType=VARCHAR} @@ -196,6 +200,9 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll and follow_info = #{followInfo,jdbcType=VARCHAR} + + and pid = #{pid,jdbcType=VARCHAR} + AND ( diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml index 64b0898..19bfc53 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml @@ -107,12 +107,13 @@ + -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}) +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}) @@ -425,6 +426,9 @@ insert into baby_patient_extend_ear_hearing_diagnose (id,baby_id,hospital_id,dia confirm_result = #{confirmResult,jdbcType=VARCHAR}, + + pid = #{pid,jdbcType=VARCHAR}, + confirm_time = #{confirmTime,jdbcType=TIMESTAMP}, @@ -440,7 +444,7 @@ delete from baby_patient_extend_ear_hearing_diagnose where id = #{id,jdbcType=VA @@ -783,6 +787,9 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ and confirm_result LIKE concat("%,",#{confirmResult,jdbcType=VARCHAR},",%") + + and pid = #{pid,jdbcType=VARCHAR} + and confirm_time = #{confirmTime,jdbcType=TIMESTAMP} @@ -800,7 +807,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ -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 +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 from baby_patient_extend_ear_screen where id = #{id,jdbcType=VARCHAR} @@ -281,6 +285,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and scr_ispass = #{scrIspass,jdbcType=INTEGER} + + and pid = #{pid,jdbcType=VARCHAR} + @@ -289,7 +296,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ select - id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass + id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid from baby_patient_extend_ear_screen status = 0 @@ -322,6 +329,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and check_doctor_id = #{checkDoctorId} + + and pid = #{pid} + and check_hospital_id in @@ -461,7 +471,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ select - id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass + 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 from baby_patient_extend_ear_screen (oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1) @@ -598,6 +611,9 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and check_doctor_id = #{checkDoctorId} + + and pid = #{pid} + and check_hospital_id = #{checkHospitalId} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml b/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml index 86958b1..836b14a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml @@ -20,11 +20,12 @@ + -insert into HIGHRISK_CHANGE_HOSPITAL (ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,CHANGEWAY,APPLY_DOCTORID,CREATE_ID,CHANGE_TYPE,STATUS,CREATE_TIME,RECEIVE_TIME,RECEIVE_DOCTORID,SCRREEN_ID) values (#{id},#{targetType},#{targetId},#{outOrgid},#{intoOrgid},#{description},#{mustdesc},#{risk},#{changeway},#{applyDoctorid},#{createId},#{changeType},#{status},#{createTime},#{receiveTime},#{receiveDoctorid},#{scrreenId}) +insert into HIGHRISK_CHANGE_HOSPITAL (ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,CHANGEWAY,APPLY_DOCTORID,CREATE_ID,CHANGE_TYPE,STATUS,CREATE_TIME,RECEIVE_TIME,RECEIVE_DOCTORID,SCRREEN_ID,pid) values (#{id},#{targetType},#{targetId},#{outOrgid},#{intoOrgid},#{description},#{mustdesc},#{risk},#{changeway},#{applyDoctorid},#{createId},#{changeType},#{status},#{createTime},#{receiveTime},#{receiveDoctorid},#{scrreenId},#{pid}) @@ -79,13 +80,16 @@ insert into HIGHRISK_CHANGE_HOSPITAL (ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_OR SCRREEN_ID = #{scrreenId,jdbcType=VARCHAR}, + + pid = #{pid,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -175,6 +179,9 @@ select ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,C and SCRREEN_ID = #{scrreenId,jdbcType=VARCHAR} + + and pid = #{pid,jdbcType=VARCHAR} + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index cc1f06b..96402e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.alibaba.fastjson.JSONObject; +import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; @@ -16,6 +17,7 @@ import com.lyms.platform.operate.web.facade.BabyEarFacade; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import com.lyms.platform.pojo.BabyModel; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -59,6 +61,8 @@ public class EarController extends BaseController { private AutoMatchFacade autoMatchFacade; @Autowired private BabyEarFacade babyEarFacade; + @Autowired + private BabyService babyService; /** @@ -293,6 +297,20 @@ public class EarController extends BaseController { BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); List babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId, hospitalId); + + + BabyModel babyModel = babyService.getOneBabyById(babyId); + String pid = babyModel.getPid(); + + // List hospiIds = babyEarFacade.getOrgHospitalIds(hospitalId); + BabyPatientExtendEarQuery babyPatientExtendEarQuery = new BabyPatientExtendEarQuery(); + babyPatientExtendEarQuery.setPersonId(pid); + // babyPatientExtendEarQuery.setCreateHospitalIds((String[]) hospiIds.toArray(new String[hospiIds.size()])); + List ears = babyPatientExtendEarService.queryBabyPatientExtendEar(babyPatientExtendEarQuery); + for(BabyPatientExtendEar es : ears){ + babyIds.add(es.getBabyPatientId()); + } + query.setBabyIds((String[]) babyIds.toArray(new String[babyIds.size()])); // d、本院：初筛未通过或复筛确诊 List screenList = screenService.queryBabyPatientExtendEarScreen(query); @@ -308,7 +326,7 @@ public class EarController extends BaseController { } else { boolean isResu = false; for (BabyPatientExtendEarScreen scr : screenList) { - if (scr.getScrIspass() == 2 && scr.getScreenType() == 2) {//是复筛并且未通过 + if (scr.getScrIspass() == 2) {//是复筛并且未通过 isResu = true; break; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index f72620b..3b0e08f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -527,7 +527,9 @@ public class FollowUpController extends BaseController { if (loginState == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } - + BabyModel babyModel = babyService.getOneBabyById(obj.getBabyId()); + String pid = babyModel.getPid(); + obj.setPid(pid); String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); obj.setId(UUID.randomUUID().toString().replace("-", "")); obj.setIfdel(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index 4bef223..75c25c2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -892,6 +892,7 @@ public class HearDiagnManageController extends BaseController { } babyQuery.setHospitalId(hospitalId); + babyQuery.setNoEnable("0"); List babyModels = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); List babyIds = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 99c48d3..c3f41e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -335,8 +335,8 @@ public class HearingDiagnoseController extends BaseController { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - //医院ID 集合。本院、外院、全部... - List outOrgids = new ArrayList<>(); + + List pids = new ArrayList<>(); if (hdReq.getSource() != null) { if (hdReq.getSource() == 2) {//2.外院 //转诊过来的医院id @@ -348,33 +348,20 @@ public class HearingDiagnoseController extends BaseController { List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); if (hchList != null && hchList.size() > 0) { for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收 - outOrgids.add(hch.getOutOrgid()); + pids.add(hch.getPid()); } } } else if (hdReq.getSource() == 1) {//1.本院 - //当前医院 - outOrgids.add(hospitalId); - } else {//4.全部医院/默认全部医院 - //当前登录人区域医院Id - //当前医院 - outOrgids.add(hospitalId); - //转诊过来的医院id - HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); - hchQuery.setTargetType(2);//儿童 - hchQuery.setChangeType(1);//听力转诊 - hchQuery.setStatus(2);//已接受 - hchQuery.setIntoOrgid(hospitalId); - List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); - if (hchList != null && hchList.size() > 0) { - for (HighriskChangeHospital hch : hchList) { - outOrgids.add(hch.getOutOrgid()); - } + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + babyQuery.setHospitalId(hospitalId); + babyQuery.setEnable("2"); + List earBabies = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + for (BabyPatientExtendEarBaby eb:earBabies){ + pids.add(eb.getBabyPatientId()); } } - } else { - //当前医院 - outOrgids.add(hospitalId); } + BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery(); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId @@ -393,23 +380,13 @@ public class HearingDiagnoseController extends BaseController { } } - scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()])); - if (scrQuery.getCheckHospitalIds() == null || scrQuery.getCheckHospitalIds().length == 0) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); - } //主数据 List babyIds = screenService.queryScrBabyIds(scrQuery); - if (babyIds.size() == 0) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); - } - - //设置要显示的医院集合（已加入条件本院、外院、全部） BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); - + query.setPids((String[]) pids.toArray(new String[pids.size()])); //设置要查询的babyId - query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - + query.setHospitalId(hospitalId); if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间 query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime()); } @@ -794,6 +771,8 @@ public class HearingDiagnoseController extends BaseController { if(obj.getIsconfirm()==1){ obj.setConfirmTime(new Date()); } + String pid = babyModel.getPid(); + obj.setPid(pid); obj.setIfdel(0); obj.setCreateTime(new Date()); obj.setCreateId(String.valueOf(loginState.getId())); @@ -805,8 +784,9 @@ public class HearingDiagnoseController extends BaseController { //根据babyId和当前医院id获取是否有转诊记录 HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery(); hchQuery.setTargetType(2); - hchQuery.setTargetId(obj.getBabyId()); + // hchQuery.setTargetId(obj.getBabyId()); hchQuery.setIntoOrgid(hospitalId); + hchQuery.setPid(pid); hchQuery.setStatus(1); List hchList = highchangeService.queryHighriskChangeHospital(hchQuery); if (hchList != null && hchList.size() > 0) { @@ -816,7 +796,7 @@ public class HearingDiagnoseController extends BaseController { hch.setReceiveDoctorid(String.valueOf(loginState.getId())); highchangeService.updateHighriskChangeHospital(hch); //调用儿童档案接口，将隐藏档案设置为显示 - babyEarFacade.showBabyEar(obj.getBabyId()); + babyEarFacade.showBabyEar(obj.getBabyId(),hospitalId); } } //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index b78f862..e348279 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -522,6 +522,9 @@ public class HighriskChangeHospitalController extends BaseController { if (StringUtil.isBlank(obj.getTargetId())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); } + BabyModel babyModel = babyService.getOneBabyById(obj.getTargetId()); + String pid = babyModel.getPid(); + obj.setPid(pid); obj.setId(UUID.randomUUID().toString().replace("-", "")); obj.setTargetType(2);//儿童 obj.setCreateTime(new Date()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 00c98bd..b431468 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -210,19 +210,41 @@ public class BabyEarFacade { * @param babyId 儿童档案Id * @return 操作是否成功 */ - public boolean showBabyEar(String babyId) { + public boolean showBabyEar(String babyId,String hospitalId) { if (StringUtils.isEmpty(babyId)) { return false; } + BabyModel babyModel = babyService.getOneBabyById(babyId); + String pid = babyModel.getPid(); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setPid(pid); + babyQuery.setEnable("0"); + babyQuery.setHospitalId(hospitalId); + List babyModels = babyService.queryBabyWithQuery(babyQuery); + if(CollectionUtils.isNotEmpty(babyModels)){ + babyModel = babyModels.get(0); + } - //建立儿童隐藏档案 + //儿童转诊档案设置为 1-转诊已接收 if (babyModel != null) { babyModel.setYn(YnEnums.YES.getId()); babyModel.setModified(new Date()); babyModel.setEnable("1"); babyService.updateOneBaby(babyModel, babyId); } + BabyPatientExtendEarBabyQuery extendEarBabyQuery = new BabyPatientExtendEarBabyQuery(); + extendEarBabyQuery.setBabyPatientId(babyModel.getId()); + extendEarBabyQuery.setEnable("0"); + extendEarBabyQuery.setHospitalId(hospitalId); + + List babyPatientExtendEarBaby = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(extendEarBabyQuery); + + if(CollectionUtils.isNotEmpty(babyPatientExtendEarBaby)){ + BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBaby.get(0); + earBaby.setEnable("1"); + babyPatientExtendEarBabyService.updateBabyPatientExtendEarBaby(earBaby); + } BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); earQuery.setBabyPatientId(babyId); @@ -281,18 +303,48 @@ public class BabyEarFacade { BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); earQuery.setBabyPatientId(babyId); - + // earQuery.setCreateHospitalId(hospitalId); List ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); if (CollectionUtils.isNotEmpty(ears)) { BabyPatientExtendEar ear = ears.get(0); - //如果相同，则已经存在，不处理 - if (!newBabyId.equals(babyId)) { + //如果不相同转诊档案 + if (!hospitalId.equals(ear.getCreateHospitalId())) { ear.setId(UUID.randomUUID().toString().replace("-", "")); ear.setBabyPatientId(newBabyId); ear.setCreateHospitalId(hospitalId); ear.setStatus(YnEnums.NO.getId()); babyPatientExtendEarService.addBabyPatientExtendEar(ear); + BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery(); + query.setBabyPatientId(babyId); + List babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(query); + if(CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)){ + BabyPatientExtendEarBaby earBaby = babyPatientExtendEarBabies.get(0); + if(!earBaby.getHospitalId().equals(hospitalId)){ + BabyPatientExtendEarBaby babyPatientExtendEarBaby = new BabyPatientExtendEarBaby(); + babyModel = babyService.getOneBabyById(newBabyId); + babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", "")); + babyPatientExtendEarBaby.setName(babyModel.getName()); + babyPatientExtendEarBaby.setSex(babyModel.getSex()); + babyPatientExtendEarBaby.setCardno(babyModel.getCardNo()); + babyPatientExtendEarBaby.setBirth(babyModel.getBirth()); + babyPatientExtendEarBaby.setMname(babyModel.getMname()); + babyPatientExtendEarBaby.setMcertTypeId(babyModel.getMcertTypeId()); + babyPatientExtendEarBaby.setMcertNo(babyModel.getMcertNo()); + babyPatientExtendEarBaby.setMphone(babyModel.getMphone()); + babyPatientExtendEarBaby.setVcCardNo(babyModel.getVcCardNo()); + babyPatientExtendEarBaby.setBuildDoctor(babyModel.getBuildDoctor()); + babyPatientExtendEarBaby.setHospitalId(babyModel.getHospitalId()); + babyPatientExtendEarBaby.setBuildType(babyModel.getBuildType()); + babyPatientExtendEarBaby.setYn(babyModel.getYn()); + babyPatientExtendEarBaby.setBuildDate(babyModel.getBuildDate()); + babyPatientExtendEarBaby.setEnable(babyModel.getEnable()); + babyPatientExtendEarBaby.setBabyPatientId(babyModel.getId()); + babyPatientExtendEarBaby.setBabyEarId(ear.getId()); + babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby); + } + } + //儿童基本信息 BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery(); earBirthQuery.setBabyPatientId(babyId); @@ -464,8 +516,10 @@ public class BabyEarFacade { babyPatientExtendEarBaby.setBuildType(baby.getBuildType()); babyPatientExtendEarBaby.setYn(baby.getYn()); babyPatientExtendEarBaby.setBuildDate(baby.getBuildDate()); + babyPatientExtendEarBaby.setEnable(baby.getEnable()); babyPatientExtendEarBaby.setBabyPatientId(babyPatientId); babyPatientExtendEarBaby.setBabyEarId(babyPatientExtendEar.getId()); + babyPatientExtendEarBaby.setPersonId(baby.getPid()); BabyPatientExtendEarBabyQuery extendEarBabyQuery = new BabyPatientExtendEarBabyQuery(); extendEarBabyQuery.setBabyPatientId(babyPatientId); @@ -1671,6 +1725,10 @@ public class BabyEarFacade { if (null != babyPatientExtendEarScreen) { String hId = autoMatchFacade.getHospitalId(userId); if (StringUtils.isEmpty(babyPatientExtendEarScreen.getId())) { + + BabyModel babyModel = babyService.getOneBabyById(babyPatientExtendEarScreen.getBabyId()); + String pid = babyModel.getPid(); + babyPatientExtendEarScreen.setPid(pid); babyPatientExtendEarScreen.setStatus(0); babyPatientExtendEarScreen.setId(UUID.randomUUID().toString().replace("-", "")); babyPatientExtendEarScreen.setCreateDate(new Date());