From 2cb50e5adade82a03a9d2455447060cd1296922e Mon Sep 17 00:00:00 2001 From: wtt Date: Wed, 18 Nov 2020 15:09:23 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/pojo/BabySieveQhdModel.java | 9 ++++----- .../lyms/platform/operate/web/facade/BabySieveFacede.java | 13 +++++++++++-- .../operate/web/request/BabySieveAddQhdRequest.java | 2 +- .../platform/operate/web/utils/BabySieveQhdHandleTask.java | 13 +++++++------ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java index 1ebfade..7ddbe16 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java @@ -2,8 +2,10 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.enums.FmTypeEnums; +import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.result.BaseModel; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -401,7 +403,6 @@ public class BabySieveQhdModel extends BaseModel { map.put("bhnum",bhnum); map.put("matdeliverId",matdeliverId); map.put("patientId",patientId); - map.put("hospitalId",hospitalId); String s = ""; if("1".equals(sieveStatuseNw)){ map.put("sieveStatuseNw","已申请"); @@ -463,10 +464,8 @@ public class BabySieveQhdModel extends BaseModel { String fmName = FmTypeEnums.getFmNameById(dueType); map.put("dueType",fmName); } - if("0" == sex){ - map.put("sex","男"); - }else if("1" == sex){ - map.put("sex","女"); + if(StringUtils.isNotEmpty(sex)){ + map.put("sex",SexEnum.getTextById(Integer.parseInt(sex))); } map.put("diseaseSieve",diseaseSieve); if("0".equals(buruSum)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 837535c..0cb7fe5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -19,7 +19,9 @@ import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.LisHandleTask; import com.lyms.platform.permission.model.LisReportModel; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import com.mchange.v1.util.ListUtils; @@ -71,7 +73,8 @@ public class BabySieveFacede { private AntenatalExaminationFacade antenatalExaminationFacade; @Autowired private BabyService babyService; - + @Autowired + private UsersService usersService; /** * 新生儿筛查申请前，查询孕妇是否在本院建档以及是否已经录入分娩记录 @@ -778,7 +781,13 @@ public class BabySieveFacede { BaseObjectResponse br = new BaseObjectResponse(); BabySieveQhdModel bm = babySieveQhdService.findOneBabySieveById(id); if (bm != null) { - br.setData(bm.convertToDataModel()); + Map map = bm.convertToDataModel(); + map.put("ssHospital",XsescEnums.getYchospitalId(bm.getSsHospital()).getYchospitalName()); + Users user = usersService.getUsers(Integer.valueOf(bm.getCollectDocterId())); + if (user != null) { + map.put("collectDocterId",user.getName()); + } + br.setData(map); br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); return br; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java index af5ab48..b97f28c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddQhdRequest.java @@ -94,7 +94,7 @@ public class BabySieveAddQhdRequest implements IBasicRequestConvert babies = maternalDeliverModel.getBaby(); - //分娩方式 + //分娩记录获取分娩方式，如果儿童筛查有分娩记录就不在使用分娩信息中的分娩信息 String deliveryMode = ""; - if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { + if (bb && StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { StringBuilder sb = new StringBuilder(); Map m = JsonUtil.str2Obj(maternalDeliverModel.getDeliveryMode(), Map.class); String fmfs = null; @@ -159,9 +163,6 @@ public class BabySieveQhdHandleTask implements Callable { } if (deliveryMode.contains("顺产")) { babySieveQhdManager.setDueType(deliveryMode); - } else { - babySieveQhdManager.setDueType(deliveryMode); - babySieveQhdManager.setOperationCause(maternalDeliverModel.getOperationCause() == null ? "--" : maternalDeliverModel.getOperationCause()); } if (org.apache.commons.collections.CollectionUtils.isNotEmpty(babies)) { -- 1.8.3.1