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 8f3e16a..d45c625 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 @@ -229,12 +229,23 @@ 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()); - int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + + AntExRecordQuery antExRecordQuery1=new AntExRecordQuery(); + antExRecordQuery1.setCheckTimeStart(e.getCheckTime()); + antExRecordQuery1.setPid(e.getPid()); + antExRecordQuery1.setHospitalId(hospital); + + //本院低次 + 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); @@ -242,9 +253,9 @@ public class AntExRecordFacade { int chi = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); antExChuQuery.setHospitalId(hospital); //本院的初诊记录 - int chb = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); - antExManagerResult.settTimes(i + b); - antExManagerResult.setChTimes(chi + chb); + int chb = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());*/ + antExManagerResult.settTimes(recordService.count(antExRecordQuery1)); + antExManagerResult.setChTimes(dichi); //高危因素 antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); antExManagerResult.setRiskFactor(commonService.resloveFactor(e.gethRisk()));