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 89124c9..cc3665e 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 @@ -8,7 +8,6 @@ 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; @@ -20,7 +19,10 @@ 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.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.ReferralApplyOrderQuery; +import com.lyms.platform.query.SieveApplyOrderQuery; +import com.lyms.platform.query.SieveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -59,6 +61,8 @@ public class ApplyOrderFacade { private BasicConfigService basicConfigService; @Autowired private BabyBookbuildingService babyBookbuildingService; + @Autowired + private BabyCheckFacade babyCheckFacade; /** * 增加转诊申请 @@ -284,26 +288,21 @@ public class ApplyOrderFacade { if (null != zhuanc1) { zhuanRname = zhuanc1.getName(); } - BabyModelQuery babyModelQuery=new BabyModelQuery(); + /* BabyModelQuery babyModelQuery=new BabyModelQuery(); babyModelQuery.setId(applyOrderModel.getParentId()); babyModelQuery.setYn(YnEnums.YES.getId()); - List babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + List babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);*/ babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); - if(CollectionUtils.isNotEmpty(babyModel)){ - BabyModel model= babyModel.get(0); + List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); String diagnose = ""; - if (!com.lyms.platform.common.utils.StringUtils.isEmpty(model.getDiagnose())) { - List diagList = JsonUtil.toList(model.getDiagnose(), List.class); - if (CollectionUtils.isNotEmpty(diagList)) { + if (CollectionUtils.isNotEmpty(diagnoseList)) { diagnose = ""; - for (Object obj : diagList) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String) obj); + for (String obj : diagnoseList) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj); if (basicConfig != null) { diagnose += basicConfig.getName() + " "; } } - } - } babyApplyOrderResult.sethRisk(diagnose); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 4fa52a4..e372851 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -426,7 +426,7 @@ public class BabyCheckFacade { * @param pid person表的id * @return */ - private List getBabyLastDiagnose(String pid) + public List getBabyLastDiagnose(String pid) { //诊断 List list = null;