From 13851c5e3c608237102043f1e713ae90adb6e18d Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Tue, 17 Sep 2019 17:17:27 +0800 Subject: [PATCH] update bug --- .../resources/mainOrm/master/BabyPatientExtendEarBaby.xml | 2 +- .../operate/web/controller/HearDiagnManageController.java | 12 +++++++++--- .../web/controller/HighriskChangeHospitalController.java | 10 +++++++++- .../operate/web/result/HighriskChangeHospitalListResult.java | 12 ++++++++++++ 4 files changed, 31 insertions(+), 5 deletions(-) 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 176cd49..d51560c 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml @@ -217,7 +217,7 @@ select id,name,sex,cardNo,birth,mname,mcert_type_id,mcert_no,mphone,vc_card_no,b and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR} - + and baby_patient_id in #{item} 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 0be72fa..a54d715 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 @@ -1338,7 +1338,9 @@ public class HearDiagnManageController extends BaseController { babyQuery.setBirthStart(hdReq.getBirthStartTime()); babyQuery.setBirthEnd(hdReq.getBirthEndTime()); babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + if (list.size() > 0) { + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + } List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); List babyIds = new ArrayList<>(); @@ -1518,7 +1520,9 @@ public class HearDiagnManageController extends BaseController { babyQuery.setBirthStart(model.getBirthStartTime()); babyQuery.setBirthEnd(model.getBirthEndTime()); babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + if (list.size() > 0) { + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + } List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); @@ -1765,7 +1769,9 @@ public class HearDiagnManageController extends BaseController { babyQuery.setOffset((model.getPage() - 1) * model.getLimit()); babyQuery.setLimit(model.getLimit()); babyQuery.setPage(model.getPage()); - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + if (list.size() > 0) { + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + } List babyIds = new ArrayList<>(); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id 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 0a668a4..af80317 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyService; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; @@ -17,6 +18,7 @@ import com.lyms.platform.operate.web.facade.OperateLogFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.result.HighriskChangeHospitalListResult; import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; @@ -71,6 +73,9 @@ public class HighriskChangeHospitalController extends BaseController { @Autowired private AreaCountFacade areaCountFacade; + @Autowired + private BasicConfigService basicConfigService; + /** * 导出听力转诊列表 * @@ -402,6 +407,7 @@ public class HighriskChangeHospitalController extends BaseController { rs.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); rs.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex()))); rs.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth()))); + rs.setHabitation(CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService)); } if (type != null && type == 1) {//转出 @@ -664,7 +670,9 @@ public class HighriskChangeHospitalController extends BaseController { if (type != null && type == 1) {//转出 babyQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArry)); } - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + if (list.size() > 0) { + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); + } List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); //查询建档记录 if (CollectionUtils.isNotEmpty(models)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java index db537ba..e3089c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java @@ -39,6 +39,18 @@ public class HighriskChangeHospitalListResult { private String receiveTime; //状态 0-未接受 1-已接受 private String status; + + //居住地 + private String habitation; + + public String getHabitation() { + return habitation; + } + + public void setHabitation(String habitation) { + this.habitation = habitation; + } + /** * 听筛记录ID */ -- 1.8.3.1