diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index ea3c2a4..1d1f864 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -1,9 +1,6 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.ApplyOrderService; -import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.biz.service.SieveService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; @@ -11,6 +8,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest; @@ -25,10 +23,7 @@ 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.PatientsQuery; -import com.lyms.platform.query.ReferralApplyOrderQuery; -import com.lyms.platform.query.SieveApplyOrderQuery; -import com.lyms.platform.query.SieveQuery; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -63,6 +58,10 @@ public class ApplyOrderFacade { private AntenatalExaminationFacade antenatalExaminationFacade; @Autowired private UsersService usersService; + @Autowired + private BasicConfigService basicConfigService; + @Autowired + private BabyBookbuildingService babyBookbuildingService; /** * 增加转诊申请 @@ -271,8 +270,29 @@ public class ApplyOrderFacade { if (null != zhuanc1) { zhuanRname = zhuanc1.getName(); } - + BabyModelQuery babyModelQuery=new BabyModelQuery(); + babyModelQuery.setId(applyOrderModel.getParentId()); + babyModelQuery.setYn(YnEnums.YES.getId()); + List babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); + if(CollectionUtils.isNotEmpty(babyModel)){ + BabyModel model= babyModel.get(0); + String diagnose = ""; + if (!com.lyms.platform.common.utils.StringUtils.isEmpty(model.getDiagnose())) { + List diagList = JsonUtil.toList(model.getDiagnose(), List.class); + if (CollectionUtils.isNotEmpty(diagList)) { + diagnose = ""; + for (Object obj : diagList) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj); + if (basicConfig != null) { + diagnose += basicConfig.getName() + " "; + } + } + } + } + babyApplyOrderResult.sethRisk(diagnose); + } + babyApplyOrderResults.add(babyApplyOrderResult); } }