jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 13851c5e3c608237102043f1e713ae90adb6e18d

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

update bug

Showing 4 changed files with 31 additions and 5 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml View file @ 13851c5
... ... @@ -217,7 +217,7 @@
217 217 and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}
218 218 </if>
219 219  
220   - <if test="babyPatientIds != null">
  220 + <if test="babyPatientIds != null and babyPatientIds!=''">
221 221 and baby_patient_id in
222 222 <foreach item="item" index="index" collection="babyPatientIds" open="(" separator="," close=")">
223 223 #{item}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ 13851c5
... ... @@ -1338,7 +1338,9 @@
1338 1338 babyQuery.setBirthStart(hdReq.getBirthStartTime());
1339 1339 babyQuery.setBirthEnd(hdReq.getBirthEndTime());
1340 1340 babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()]));
1341   - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  1341 + if (list.size() > 0) {
  1342 + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  1343 + }
1342 1344 List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
1343 1345  
1344 1346 List<String> babyIds = new ArrayList<>();
... ... @@ -1518,7 +1520,9 @@
1518 1520 babyQuery.setBirthStart(model.getBirthStartTime());
1519 1521 babyQuery.setBirthEnd(model.getBirthEndTime());
1520 1522 babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()]));
1521   - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  1523 + if (list.size() > 0) {
  1524 + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  1525 + }
1522 1526 List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
1523 1527  
1524 1528  
... ... @@ -1765,7 +1769,9 @@
1765 1769 babyQuery.setOffset((model.getPage() - 1) * model.getLimit());
1766 1770 babyQuery.setLimit(model.getLimit());
1767 1771 babyQuery.setPage(model.getPage());
1768   - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  1772 + if (list.size() > 0) {
  1773 + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  1774 + }
1769 1775 List<String> babyIds = new ArrayList<>();
1770 1776  
1771 1777 //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ 13851c5
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.BabyBookbuildingService;
4 4 import com.lyms.platform.biz.service.BabyService;
  5 +import com.lyms.platform.biz.service.BasicConfigService;
5 6 import com.lyms.platform.common.annotation.TokenRequired;
6 7 import com.lyms.platform.common.base.BaseController;
7 8 import com.lyms.platform.common.base.LoginContext;
... ... @@ -17,6 +18,7 @@
17 18 import com.lyms.platform.operate.web.result.FrontEndResult;
18 19 import com.lyms.platform.operate.web.result.HighriskChangeHospitalListResult;
19 20 import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult;
  21 +import com.lyms.platform.operate.web.utils.CommonsHelper;
20 22 import com.lyms.platform.operate.web.utils.ResponseUtil;
21 23 import com.lyms.platform.permission.model.*;
22 24 import com.lyms.platform.permission.service.*;
... ... @@ -71,6 +73,9 @@
71 73 @Autowired
72 74 private AreaCountFacade areaCountFacade;
73 75  
  76 + @Autowired
  77 + private BasicConfigService basicConfigService;
  78 +
74 79 /**
75 80 * 导出听力转诊列表
76 81 *
... ... @@ -402,6 +407,7 @@
402 407 rs.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
403 408 rs.setSex(com.lyms.platform.common.utils.StringUtils.emptyDeal(SexEnum.getTextById(babyModel.getSex())));
404 409 rs.setBirthday(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(babyModel.getBirth())));
  410 + rs.setHabitation(CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService));
405 411 }
406 412  
407 413 if (type != null && type == 1) {//转出
... ... @@ -664,7 +670,9 @@
664 670 if (type != null && type == 1) {//转出
665 671 babyQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArry));
666 672 }
667   - babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  673 + if (list.size() > 0) {
  674 + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
  675 + }
668 676 List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
669 677 //查询建档记录
670 678 if (CollectionUtils.isNotEmpty(models)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java View file @ 13851c5
... ... @@ -39,6 +39,18 @@
39 39 private String receiveTime;
40 40 //状态 0-未接受 1-已接受
41 41 private String status;
  42 +
  43 + //居住地
  44 + private String habitation;
  45 +
  46 + public String getHabitation() {
  47 + return habitation;
  48 + }
  49 +
  50 + public void setHabitation(String habitation) {
  51 + this.habitation = habitation;
  52 + }
  53 +
42 54 /**
43 55 * 听筛记录ID
44 56 */