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 9b753a8..0a5a357 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 @@ -16,6 +16,7 @@ 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.*; +import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.MatDeliverQuery; import com.lyms.platform.query.PatientsQuery; @@ -154,10 +155,11 @@ public class MatDeliverFacade { antExQuery.setYn(YnEnums.YES.getId()); List examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); try { + String tTireNumber=""; + List data = new ArrayList(); if(CollectionUtils.isNotEmpty(examinationModel)){ - List data = new ArrayList(); if(null!=examinationModel&&StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())){ - matDeliverListResult.setTireNumber1(examinationModel.get(0).getTireNumber()); + tTireNumber=examinationModel.get(0).getTireNumber(); List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(),List.class); for(int i=0;i antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery); + if(CollectionUtils.isNotEmpty(antExChuModels)){ + tTireNumber=antExChuModels.get(0).getTireNumber(); + List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(),List.class); + for(int i=0;i