diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index ab27943..3250757 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -214,8 +214,6 @@ public class AntExRecordFacade { List data = new ArrayList<>(); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery); if (CollectionUtils.isNotEmpty(antExRecordModelList)) { - AntExChuQuery antExChuQuery = new AntExChuQuery(); - AntExQuery antExQuery = new AntExQuery(); for (AntExRecordModel e : antExRecordModelList) { AntExManagerResult antExManagerResult = new AntExManagerResult(); antExManagerResult.convertToResult(e); @@ -232,7 +230,6 @@ public class AntExRecordFacade { antExManagerResult.setAddr(CommonsHelper.getResidence(e.getProvinceRegisterId(), e.getCityRegisterId(), e.getAreaRegisterId(), e.getStreetRegisterId(), e.getAddressRegister(), basicConfigService)); } - //登记人 if (org.apache.commons.lang.StringUtils.isNotEmpty(e.getBuildDoctor())) { if (NumberUtils.isNumber(e.getBuildDoctor())) { @@ -260,16 +257,6 @@ public class AntExRecordFacade { } } - antExQuery.setPid(e.getPid()); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(null); - antExQuery.setStart(e.getCheckTime()); - antExChuQuery.setPid(e.getPid()); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setHospitalId(null); - antExChuQuery.setStart(e.getCheckTime()); - - AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); antExRecordQuery1.setCheckTimeEnd(e.getCheckTime()); antExRecordQuery1.setPid(e.getPid()); @@ -278,15 +265,7 @@ public class AntExRecordFacade { //本院低次 int dichi = recordService.count(antExRecordQuery1); antExRecordQuery1.setHospitalId(null); - /* int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); - antExChuQuery.setHospitalId(null); - int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); - antExQuery.setHospitalId(hospital); - //本院的复诊记录 - int chi = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); - antExChuQuery.setHospitalId(hospital); - //本院的初诊记录 - int chb = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());*/ + antExManagerResult.settTimes(recordService.count(antExRecordQuery1)); antExManagerResult.setChTimes(dichi); //高危因素