From 6ab6366037c570c89c71c0a41b28bd19a0628023 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 9 Nov 2018 11:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E7=BB=9F=E8=AE=A1=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/SieveFacade.java | 127 ++++++++++++--------- 1 file changed, 73 insertions(+), 54 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index adc6f94..d29c129 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1183,29 +1183,39 @@ public class SieveFacade { List orgs = organizationService.queryOrganization(idQuery); List hids = getConditionHospitalIds(currentUserHospPermissions, orgs); - SieveQuery sieveQuery = new SieveQuery(); - sieveQuery.setHospitalIds(hids); - sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setStatus(3); - if (dates != null) { - sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0])); - if (dates.length == 2) { - sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + if (CollectionUtils.isNotEmpty(hids)) + { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setHospitalIds(hids); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setStatus(3); + if (dates != null) { + sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1])); + } } - } - int sieveFinishCount = sieveService.queryListCount(sieveQuery); - csItems.add(String.valueOf(sieveFinishCount)); - - DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); - diagnosisQuery.setHospitalIds(hids); - if (dates != null) { - diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0])); - if (dates.length == 2) { - diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + int sieveFinishCount = sieveService.queryListCount(sieveQuery); + csItems.add(String.valueOf(sieveFinishCount)); + + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); + diagnosisQuery.setHospitalIds(hids); + if (dates != null) { + diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1])); + } } + int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery); + dItems.add(String.valueOf(diagnosisCount)); } - int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery); - dItems.add(String.valueOf(diagnosisCount)); + else + { + csItems.add("0"); + dItems.add("0"); + } + + } map.put("data", csItems); @@ -1241,44 +1251,53 @@ public class SieveFacade { List hids = getConditionHospitalIds(currentUserHospPermissions, orgs); - - //应筛查人数 - SieveQuery ySieveQuery = new SieveQuery(); - ySieveQuery.setHospitalIds(hids); - if (dates != null) { - ySieveQuery.setCreatedStart(DateUtil.parseYMD(dates[0])); - if (dates.length == 2) { - ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + if (CollectionUtils.isNotEmpty(hids)) + { + //应筛查人数 + SieveQuery ySieveQuery = new SieveQuery(); + ySieveQuery.setHospitalIds(hids); + if (dates != null) { + ySieveQuery.setCreatedStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1])); +// ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } } - } - int ycount = sieveService.queryListCount(ySieveQuery); - items.add(String.valueOf(ycount)); - - //产筛总数 - SieveQuery sieveQuery1 = new SieveQuery(); - sieveQuery1.setHospitalIds(hids); - sieveQuery1.setYn(YnEnums.YES.getId()); - sieveQuery1.setStatus(3); - if (dates != null) { - sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0])); - if (dates.length == 2) { - sieveQuery1.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + int ycount = sieveService.queryListCount(ySieveQuery); + items.add(String.valueOf(ycount)); + + //产筛总数 + SieveQuery sieveQuery1 = new SieveQuery(); + sieveQuery1.setHospitalIds(hids); + sieveQuery1.setYn(YnEnums.YES.getId()); + sieveQuery1.setStatus(3); + if (dates != null) { + sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + sieveQuery1.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1])); + } } - } - int sieveFinishCountAll = sieveService.queryListCount(sieveQuery1); - items.add(String.valueOf(sieveFinishCountAll)); - - //诊断总人数 - DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery(); - diagnosisQuery1.setHospitalIds(hids); - if (dates != null) { - diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0])); - if (dates.length == 2) { - diagnosisQuery1.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + int sieveFinishCountAll = sieveService.queryListCount(sieveQuery1); + items.add(String.valueOf(sieveFinishCountAll)); + + //诊断总人数 + DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery(); + diagnosisQuery1.setHospitalIds(hids); + if (dates != null) { + diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + diagnosisQuery1.setResultDateEnd(DateUtil.parseYMDHMS(dates[1])); + } } + int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1); + items.add(String.valueOf(diagnosisCountAll)); + } + else + { + items.add("0"); + items.add("0"); + items.add("0"); } - int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1); - items.add(String.valueOf(diagnosisCountAll)); num++; result.add(items); } -- 1.8.3.1