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 f70d9ce..09245bf 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 @@ -26,6 +26,8 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { private Date buildDate; private String babyPatientId; private String babyEarId; + //儿童姓名、母亲证件号、母亲联系方式 + private String queryNo; /** * 生日 */ @@ -55,6 +57,13 @@ public class BabyPatientExtendEarBabyQuery extends BaseQuery { return id; } + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public void setId(String id) { this.id = id; 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 dbaea77..3a3089e 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml @@ -2,191 +2,216 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 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}) - - -update baby_patient_extend_ear_baby -name = #{name,jdbcType=VARCHAR}, - - -sex = #{sex,jdbcType=INTEGER}, - - -cardNo = #{cardno,jdbcType=VARCHAR}, - - -birth = #{birth,jdbcType=TIMESTAMP}, - - -mname = #{mname,jdbcType=VARCHAR}, - - -mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR}, - - -mcert_no = #{mcertNo,jdbcType=VARCHAR}, - - -mphone = #{mphone,jdbcType=VARCHAR}, - - -vc_card_no = #{vcCardNo,jdbcType=VARCHAR}, - - -build_doctor = #{buildDoctor,jdbcType=VARCHAR}, - - -hospital_id = #{hospitalId,jdbcType=VARCHAR}, - - -build_type = #{buildType,jdbcType=INTEGER}, - - -enable = #{enable,jdbcType=VARCHAR}, - - -yn = #{yn,jdbcType=INTEGER}, - - -build_date = #{buildDate,jdbcType=TIMESTAMP}, - - -baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}, - - -baby_ear_id = #{babyEarId,jdbcType=VARCHAR}, - - -where id = #{id,jdbcType=VARCHAR} - - - - + + update baby_patient_extend_ear_baby + + + name = #{name,jdbcType=VARCHAR}, + + + sex = #{sex,jdbcType=INTEGER}, + + + cardNo = #{cardno,jdbcType=VARCHAR}, + + + birth = #{birth,jdbcType=TIMESTAMP}, + + + mname = #{mname,jdbcType=VARCHAR}, + + + mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR}, + + + mcert_no = #{mcertNo,jdbcType=VARCHAR}, + + + mphone = #{mphone,jdbcType=VARCHAR}, + + + vc_card_no = #{vcCardNo,jdbcType=VARCHAR}, + + + build_doctor = #{buildDoctor,jdbcType=VARCHAR}, + + + hospital_id = #{hospitalId,jdbcType=VARCHAR}, + + + build_type = #{buildType,jdbcType=INTEGER}, + + + enable = #{enable,jdbcType=VARCHAR}, + + + yn = #{yn,jdbcType=INTEGER}, + + + build_date = #{buildDate,jdbcType=TIMESTAMP}, + + + baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}, + + + baby_ear_id = #{babyEarId,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + + delete from baby_patient_extend_ear_baby where id = #{id,jdbcType=VARCHAR} - - select 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 from baby_patient_extend_ear_baby where id = #{id,jdbcType=VARCHAR} - - -order by ${sort} - -limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - - - - - - - - - 1 = 1 - -and id = #{id,jdbcType=VARCHAR} - - -and name = #{name,jdbcType=VARCHAR} - - -and sex = #{sex,jdbcType=INTEGER} - - -and cardNo = #{cardno,jdbcType=VARCHAR} - - -and birth = #{birth,jdbcType=TIMESTAMP} - - -and mname = #{mname,jdbcType=VARCHAR} - - -and mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR} - - -and mcert_no = #{mcertNo,jdbcType=VARCHAR} - - -and mphone = #{mphone,jdbcType=VARCHAR} - - -and vc_card_no = #{vcCardNo,jdbcType=VARCHAR} - - -and build_doctor = #{buildDoctor,jdbcType=VARCHAR} - - -and hospital_id = #{hospitalId,jdbcType=VARCHAR} - - -and build_type = #{buildType,jdbcType=INTEGER} - - -and enable = #{enable,jdbcType=VARCHAR} - - -and yn = #{yn,jdbcType=INTEGER} - - -and build_date = #{buildDate,jdbcType=TIMESTAMP} - - -and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR} - - -and baby_ear_id = #{babyEarId,jdbcType=VARCHAR} - - - - - - - - - - - - + + + order by ${sort} + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + 1 = 1 + + and id = #{id,jdbcType=VARCHAR} + + + and name = #{name,jdbcType=VARCHAR} + + + and ( + name LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%") + or + mcertNo LIKE concat("%",#{queryNo,jdbcType=VARCHAR},"%") + or + mphone LIKE concat(#{queryNo,jdbcType=VARCHAR},"%") + or + cardno LIKE concat(#{queryNo,jdbcType=VARCHAR},"%") + ) + + + and sex = #{sex,jdbcType=INTEGER} + + + and cardNo = #{cardno,jdbcType=VARCHAR} + + + and birth = #{birth,jdbcType=TIMESTAMP} + + + AND + + + + and + =0 + ]]> + + + and mname = #{mname,jdbcType=VARCHAR} + + + and mcert_type_id = #{mcertTypeId,jdbcType=VARCHAR} + + + and mcert_no = #{mcertNo,jdbcType=VARCHAR} + + + and mphone = #{mphone,jdbcType=VARCHAR} + + + and vc_card_no = #{vcCardNo,jdbcType=VARCHAR} + + + and build_doctor = #{buildDoctor,jdbcType=VARCHAR} + + + and hospital_id = #{hospitalId,jdbcType=VARCHAR} + + + and build_type = #{buildType,jdbcType=INTEGER} + + + and enable = #{enable,jdbcType=VARCHAR} + + + and yn = #{yn,jdbcType=INTEGER} + + + and build_date = #{buildDate,jdbcType=TIMESTAMP} + + + and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR} + + + and baby_ear_id = #{babyEarId,jdbcType=VARCHAR} + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml index d6b3221..b0bff74 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml @@ -258,11 +258,9 @@ select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,foll 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 1cfc595..597269a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml @@ -895,7 +895,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_ diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml index 745a7a4..b013d7f 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -179,7 +179,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and baby_id = #{babyId,jdbcType=VARCHAR} - and baby_id not in + and baby_id in #{item} @@ -325,7 +325,7 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and baby_id in ( - + #{babyId} ) @@ -445,7 +445,6 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ ]]> - GROUP BY baby_id @@ -454,7 +453,112 @@ 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 from baby_patient_extend_ear_screen - + + + 1 = 1 + + and id = #{id,jdbcType=VARCHAR} + + + and baby_id = #{babyId,jdbcType=VARCHAR} + + + and baby_id not in + + #{item} + + + + and screen_type = #{screenType,jdbcType=INTEGER} + + + and check_hospital_id in + + #{item} + + + + and check_hospital_id = #{checkHospitalId,jdbcType=VARCHAR} + + + and screen_date = #{screenDate,jdbcType=TIMESTAMP} + + + and high_risk_cause = #{highRiskCause,jdbcType=VARCHAR} + + + and oae_left = #{oaeLeft,jdbcType=INTEGER} + + + and oae_right = #{oaeRight,jdbcType=INTEGER} + + + and aabr_left = #{aabrLeft,jdbcType=INTEGER} + + + and aabr_right = #{aabrRight,jdbcType=INTEGER} + + + and gjb2_del_35 = #{gjb2Del35,jdbcType=INTEGER} + + + and gjb2_del_176 = #{gjb2Del176,jdbcType=INTEGER} + + + and gjb2_del_235 = #{gjb2Del235,jdbcType=INTEGER} + + + and gjb2_del_299 = #{gjb2Del299,jdbcType=INTEGER} + + + and gjb3_slc26a4_538 = #{gjb3Slc26a4538,jdbcType=INTEGER} + + + and gjb3_slc26a4_2168 = #{gjb3Slc26a42168,jdbcType=INTEGER} + + + and gjb3_slc26a4_ivs7 = #{gjb3Slc26a4Ivs7,jdbcType=INTEGER} + + + and process_option_type = #{processOptionType,jdbcType=INTEGER} + + + and process_option_desc = #{processOptionDesc,jdbcType=VARCHAR} + + + and guid_opinion = #{guidOpinion,jdbcType=VARCHAR} + + + and check_doctor_id = #{checkDoctorId,jdbcType=VARCHAR} + + + and referral_date = #{referralDate,jdbcType=TIMESTAMP} + + + and create_date = #{createDate,jdbcType=TIMESTAMP} + + + and create_user_id = #{createUserId,jdbcType=VARCHAR} + + + and create_hospital_id = #{createHospitalId,jdbcType=VARCHAR} + + + and next_check_time = #{nextCheckTime,jdbcType=TIMESTAMP} + + + and last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP} + + + and last_update_user_id = #{lastUpdateUserId,jdbcType=VARCHAR} + + + and last_update_hospital_id = #{lastUpdateHospitalId,jdbcType=VARCHAR} + + + and status = #{status,jdbcType=INTEGER} + + @@ -464,29 +568,29 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ 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 from baby_patient_extend_ear_screen - (oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1) - and screen_type = 2 - - and - + and + - - - AND - + + AND + =0 ]]> - + - and check_doctor_id = #{checkDoctorId} + and check_doctor_id = #{checkDoctorId} and check_hospital_id = #{checkHospitalId} and baby_id in ( - + #{babyId} ) @@ -502,7 +606,8 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ - select DISTINCT baby_id from baby_patient_extend_ear_screen sc 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 89c8956..c576b47 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 @@ -17,12 +17,8 @@ import com.lyms.platform.operate.web.result.FollowUpListResult; import com.lyms.platform.operate.web.result.FollowUpOneResult; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; -import com.lyms.platform.permission.service.BabyPatientExtendEarFollowUpService; -import com.lyms.platform.permission.service.HighriskChangeHospitalService; -import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -60,6 +56,8 @@ public class FollowUpController extends BaseController { private BabyBookbuildingService babyBookbuildingService; @Autowired private BabyEarFacade babyEarFacade; + @Autowired + private BabyPatientExtendEarBabyService earBabyService; /** * 根据babyId获取随访记录 @@ -245,14 +243,15 @@ public class FollowUpController extends BaseController { //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (StringUtils.isNotEmpty(fur.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId - BabyModelQuery babyQuery = new BabyModelQuery(); + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(fur.getKeyWord()); - //查询建档记录 - List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + babyQuery.setHospitalId(hospitalId); + List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + if(CollectionUtils.isNotEmpty(models)){ List babyIds = new ArrayList<>(); - for(BabyModel babyModel:models){ - babyIds.add(babyModel.getId()); + for(BabyPatientExtendEarBaby babyModel:models){ + babyIds.add(babyModel.getBabyPatientId()); } query.setBabyIds(babyIds.toArray(new String[babyIds.size()])); }else{ 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 09a6477..f38dddd 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 @@ -21,8 +21,6 @@ import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -448,32 +446,26 @@ public class HearDiagnManageController extends BaseController { List babyIds = new ArrayList<>(); - PatientsQuery patientsQuery = new PatientsQuery(); - if (model.getBirthStartTime() != null) {//儿童出生开始日期 - patientsQuery.setBirthStart(model.getBirthStartTime()); - } - - if (model.getBirthEndTime() != null) {//儿童出生结束日期 - patientsQuery.setBirthEnd(model.getBirthEndTime()); - } - - List patientses = null; - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) { - patientsQuery.setQueryNo(model.getKeyWord()); - patientses = patientsService.queryPatient1(patientsQuery, "modified"); + BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); + babyQuery.setQueryNo(model.getKeyWord()); + babyQuery.setBirthStart(model.getBirthStartTime()); + babyQuery.setBirthEnd(model.getBirthEndTime()); + babyQuery.setHospitalId(hospitalId); + List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); + if (CollectionUtils.isEmpty(models) && (StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() == null || model.getBirthEndTime() == null)) { + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); - if (CollectionUtils.isNotEmpty(patientses)) { - for (Patients pa : patientses) { - babyIds.add(pa.getId()); + if (CollectionUtils.isNotEmpty(models)) { + for (BabyPatientExtendEarBaby pa : models) { + babyIds.add(pa.getBabyPatientId()); } screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getKeyWord())) { - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + //听筛开始时间 if (model.getSecrStartTime() != null) { screenQuery.setScreenStartDate(model.getSecrStartTime()); @@ -887,22 +879,18 @@ public class HearDiagnManageController extends BaseController { List babyIds = new ArrayList<>(); for (BabyPatientExtendEarBaby babyModel : babyModels) { - babyIds.add(babyModel.getId()); + babyIds.add(babyModel.getBabyPatientId()); } - //根据儿童条件查询如果为空 - if(CollectionUtils.isEmpty(babyIds)&&(model.getMonthAgeStart()!=null||model.getMonthAgeEnd()!=null||StringUtils.isNotEmpty(model.getKeyWord())||model.getBirthStartTime()!=null||model.getBirthEndTime()!=null)){ + +//根据儿童条件查询如果为空 + if (CollectionUtils.isEmpty(babyIds) && (model.getMonthAgeStart() != null || model.getMonthAgeEnd() != null || StringUtils.isNotEmpty(model.getKeyWord()) || model.getBirthStartTime() != null || model.getBirthEndTime() != null)) { BaseListResponse result = new BaseListResponse(); result.setData(new ArrayList()); result.setErrorcode(0); return result; } - BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); - earQuery.setCreateHospitalId(hospitalId); - earQuery.setBabyPatientIds(babyIds.toArray(new String[babyIds.size()])); - //查询听力儿童档案 - List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); //查询儿童听筛记录 BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); @@ -913,7 +901,7 @@ public class HearDiagnManageController extends BaseController { screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); screenQuery.setCheckHospitalId(hospitalId); //查询全部数据 - List earScreens = screenService.notAuscultationBabyPatientExtendEarScreen(screenQuery); + List earScreens = screenService.queryBabyPatientExtendEarScreen(screenQuery); Map screenMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(earScreens)) { for (BabyPatientExtendEarScreen es : earScreens) { @@ -924,20 +912,17 @@ public class HearDiagnManageController extends BaseController { //要返回的数据 List hdmResult = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) { - for (BabyPatientExtendEar ear : babyPatientExtendEars) { + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyPatientExtendEarBaby ear : babyModels) { HearDiagnManageListResult hdm = new HearDiagnManageListResult(); - BabyModel babyModel = babyService.getOneBabyById(ear.getBabyPatientId()); - if (babyModel != null) { - hdm.setBabyName(babyModel.getName()); - hdm.setBabyId(ear.getBabyPatientId()); - hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMname())); - hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(babyModel.getMphone())); - hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone())); - hdm.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); - hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); - hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); - } + hdm.setBabyName(ear.getName()); + hdm.setBabyId(ear.getBabyPatientId()); + hdm.setMommyName(com.lyms.platform.common.utils.StringUtils.emptyDeal(ear.getMname())); + hdm.setMommnyPhone(com.lyms.platform.common.utils.StringUtils.emptyDeal(ear.getMphone())); + hdm.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(ear.getMphone())); + hdm.setMonthAge(DateUtil.getBabyMonthAge(ear.getBirth(), new Date())); + hdm.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(ear.getBirth()))); + hdm.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(ear.getSex()))); BabyPatientExtendEarScreen es = screenMap.get(ear.getBabyPatientId()); if (es != null) { hdm.setId(es.getId()); @@ -958,8 +943,7 @@ public class HearDiagnManageController extends BaseController { result.setPageInfo(pageInfo); result.setData(hdmResult); return result; - } else - { + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有数据"); } } 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 f436592..da1f3fe 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 @@ -20,7 +20,6 @@ import com.lyms.platform.operate.web.utils.MyComparator; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.query.BabyModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -62,6 +61,8 @@ public class HearingDiagnoseController extends BaseController { private BabyBookbuildingService babyBookbuildingService; @Autowired private BabyEarFacade babyEarFacade; + @Autowired + private BabyPatientExtendEarBabyService earBabyService; /** * 根据儿童id获取最后一次确诊结果 @@ -354,14 +355,14 @@ public class HearingDiagnoseController extends BaseController { BabyPatientExtendEarScreenQuery scrQuery = new BabyPatientExtendEarScreenQuery(); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (StringUtils.isNotEmpty(hdReq.getKeyWord())) {//关键字：姓名、联系方式、就诊卡 查询babyId - BabyModelQuery babyQuery = new BabyModelQuery(); + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(hdReq.getKeyWord()); - //查询建档记录 - List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + babyQuery.setHospitalId(hospitalId); + List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); if(CollectionUtils.isNotEmpty(models)){ List babyIds = new ArrayList<>(); - for(BabyModel babyModel:models){ - babyIds.add(babyModel.getId()); + for(BabyPatientExtendEarBaby babyModel:models){ + babyIds.add(babyModel.getBabyPatientId()); } scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); }else{ 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 95ce591..1b25698 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 @@ -94,7 +94,8 @@ public class BabyEarFacade { private OrganizationGroupsFacade groupsFacade; @Autowired private BabyBookbuildingService babyBookbuildingService; - + @Autowired + private BabyPatientExtendEarBabyService earBabyService; @@ -1642,16 +1643,15 @@ public class BabyEarFacade { //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId - BabyModelQuery babyQuery = new BabyModelQuery(); + BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(earScreenListRequest.getKeyWord()); + babyQuery.setHospitalId(hospitalId); babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime()); babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime()); - babyQuery.setHospitalId(hospitalId); - //查询建档记录 - List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); if (CollectionUtils.isNotEmpty(models)) { List babyIds = new ArrayList<>(); - for (BabyModel babyModel : models) { + for (BabyPatientExtendEarBaby babyModel : models) { babyIds.add(babyModel.getId()); } screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));