diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 4d2c20e..bd2154a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.MatDeliverService; import com.lyms.platform.biz.service.PatientsService; @@ -7,16 +8,21 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.request.MatDeliverQueryRequest; +import com.lyms.platform.operate.web.result.AntenatalExaminationResult; import com.lyms.platform.operate.web.result.MatDeliverListResult; import com.lyms.platform.operate.web.result.MaternalDeliverResult; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.MatDeliverQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; @@ -43,6 +49,8 @@ public class MatDeliverFacade { private PatientsService patientsService; @Autowired private OrganizationService organizationService; + @Autowired + private AntenatalExaminationService antenatalExaminationService; /** @@ -140,6 +148,20 @@ public class MatDeliverFacade { List list = matDeliverService.query(matDeliverQuery); MatDeliverListResult matDeliverListResult = new MatDeliverListResult(); matDeliverListResult.convertToResult(list, patients); + AntExQuery antExQuery=new AntExQuery(); + antExQuery.setParentId(patients.getId()); + antExQuery.setYn(YnEnums.YES.getId()); + List examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + Assert.notNull(examinationModel, "id不存在."); + try { + List list1= new ArrayList(); + if(CollectionUtils.isNotEmpty(examinationModel)){ + String s = examinationModel.get(0).getRiskFactor(); + list1 = JsonUtil.toList(s, List.class); + } + + matDeliverListResult.setRiskFactor(list1); + }catch (Exception e){} return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult); }