jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6ab6366037c570c89c71c0a41b28bd19a0628023

Authored by liquanyu
1 parent 822d2eb266
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产筛统计报表

Showing 1 changed file with 73 additions and 54 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 6ab6366
... ... @@ -1183,29 +1183,39 @@
1183 1183 List<Organization> orgs = organizationService.queryOrganization(idQuery);
1184 1184 List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
1185 1185  
1186   - SieveQuery sieveQuery = new SieveQuery();
1187   - sieveQuery.setHospitalIds(hids);
1188   - sieveQuery.setYn(YnEnums.YES.getId());
1189   - sieveQuery.setStatus(3);
1190   - if (dates != null) {
1191   - sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
1192   - if (dates.length == 2) {
1193   - sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  1186 + if (CollectionUtils.isNotEmpty(hids))
  1187 + {
  1188 + SieveQuery sieveQuery = new SieveQuery();
  1189 + sieveQuery.setHospitalIds(hids);
  1190 + sieveQuery.setYn(YnEnums.YES.getId());
  1191 + sieveQuery.setStatus(3);
  1192 + if (dates != null) {
  1193 + sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
  1194 + if (dates.length == 2) {
  1195 + sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1]));
  1196 + }
1194 1197 }
1195   - }
1196   - int sieveFinishCount = sieveService.queryListCount(sieveQuery);
1197   - csItems.add(String.valueOf(sieveFinishCount));
  1198 + int sieveFinishCount = sieveService.queryListCount(sieveQuery);
  1199 + csItems.add(String.valueOf(sieveFinishCount));
1198 1200  
1199   - DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
1200   - diagnosisQuery.setHospitalIds(hids);
1201   - if (dates != null) {
1202   - diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
1203   - if (dates.length == 2) {
1204   - diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  1201 + DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
  1202 + diagnosisQuery.setHospitalIds(hids);
  1203 + if (dates != null) {
  1204 + diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
  1205 + if (dates.length == 2) {
  1206 + diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1]));
  1207 + }
1205 1208 }
  1209 + int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery);
  1210 + dItems.add(String.valueOf(diagnosisCount));
1206 1211 }
1207   - int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery);
1208   - dItems.add(String.valueOf(diagnosisCount));
  1212 + else
  1213 + {
  1214 + csItems.add("0");
  1215 + dItems.add("0");
  1216 + }
  1217 +
  1218 +
1209 1219 }
1210 1220  
1211 1221 map.put("data", csItems);
1212 1222  
1213 1223  
1214 1224  
1215 1225  
1216 1226  
1217 1227  
... ... @@ -1241,44 +1251,53 @@
1241 1251  
1242 1252  
1243 1253 List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
1244   -
1245   - //应筛查人数
1246   - SieveQuery ySieveQuery = new SieveQuery();
1247   - ySieveQuery.setHospitalIds(hids);
1248   - if (dates != null) {
1249   - ySieveQuery.setCreatedStart(DateUtil.parseYMD(dates[0]));
1250   - if (dates.length == 2) {
1251   - ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  1254 + if (CollectionUtils.isNotEmpty(hids))
  1255 + {
  1256 + //应筛查人数
  1257 + SieveQuery ySieveQuery = new SieveQuery();
  1258 + ySieveQuery.setHospitalIds(hids);
  1259 + if (dates != null) {
  1260 + ySieveQuery.setCreatedStart(DateUtil.parseYMD(dates[0]));
  1261 + if (dates.length == 2) {
  1262 + ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1]));
  1263 +// ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  1264 + }
1252 1265 }
1253   - }
1254   - int ycount = sieveService.queryListCount(ySieveQuery);
1255   - items.add(String.valueOf(ycount));
  1266 + int ycount = sieveService.queryListCount(ySieveQuery);
  1267 + items.add(String.valueOf(ycount));
1256 1268  
1257   - //产筛总数
1258   - SieveQuery sieveQuery1 = new SieveQuery();
1259   - sieveQuery1.setHospitalIds(hids);
1260   - sieveQuery1.setYn(YnEnums.YES.getId());
1261   - sieveQuery1.setStatus(3);
1262   - if (dates != null) {
1263   - sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0]));
1264   - if (dates.length == 2) {
1265   - sieveQuery1.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  1269 + //产筛总数
  1270 + SieveQuery sieveQuery1 = new SieveQuery();
  1271 + sieveQuery1.setHospitalIds(hids);
  1272 + sieveQuery1.setYn(YnEnums.YES.getId());
  1273 + sieveQuery1.setStatus(3);
  1274 + if (dates != null) {
  1275 + sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0]));
  1276 + if (dates.length == 2) {
  1277 + sieveQuery1.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1]));
  1278 + }
1266 1279 }
1267   - }
1268   - int sieveFinishCountAll = sieveService.queryListCount(sieveQuery1);
1269   - items.add(String.valueOf(sieveFinishCountAll));
  1280 + int sieveFinishCountAll = sieveService.queryListCount(sieveQuery1);
  1281 + items.add(String.valueOf(sieveFinishCountAll));
1270 1282  
1271   - //诊断总人数
1272   - DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery();
1273   - diagnosisQuery1.setHospitalIds(hids);
1274   - if (dates != null) {
1275   - diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
1276   - if (dates.length == 2) {
1277   - diagnosisQuery1.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  1283 + //诊断总人数
  1284 + DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery();
  1285 + diagnosisQuery1.setHospitalIds(hids);
  1286 + if (dates != null) {
  1287 + diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
  1288 + if (dates.length == 2) {
  1289 + diagnosisQuery1.setResultDateEnd(DateUtil.parseYMDHMS(dates[1]));
  1290 + }
1278 1291 }
  1292 + int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
  1293 + items.add(String.valueOf(diagnosisCountAll));
1279 1294 }
1280   - int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
1281   - items.add(String.valueOf(diagnosisCountAll));
  1295 + else
  1296 + {
  1297 + items.add("0");
  1298 + items.add("0");
  1299 + items.add("0");
  1300 + }
1282 1301 num++;
1283 1302 result.add(items);
1284 1303 }