Commit 45e572039c72e12e914f96ed12602d9e2bb4f630
1 parent
7681838010
Exists in
master
and in
6 other branches
产筛统计报表
Showing 1 changed file with 43 additions and 47 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
45e5720
| ... | ... | @@ -1158,61 +1158,55 @@ |
| 1158 | 1158 | //图标数据 |
| 1159 | 1159 | List<Map<String, Object>> series = new LinkedList<>(); |
| 1160 | 1160 | |
| 1161 | - SieveQuery sieveQuery = new SieveQuery(); | |
| 1162 | - sieveQuery.setHospitalIds(currentUserHospPermissions); | |
| 1163 | - sieveQuery.setYn(YnEnums.YES.getId()); | |
| 1164 | - sieveQuery.setStatus(3); | |
| 1165 | - if (dates != null) { | |
| 1166 | - sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0])); | |
| 1167 | - if (dates.length == 2) { | |
| 1168 | - sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); | |
| 1169 | - } | |
| 1170 | - } | |
| 1171 | 1161 | |
| 1172 | - int sieveFinishCount = sieveService.queryListCount(sieveQuery); | |
| 1173 | - List<String> csItems = new ArrayList<>(); | |
| 1174 | - csItems.add(String.valueOf(sieveFinishCount)); | |
| 1175 | - Map<String, Object> map = new HashMap(); | |
| 1176 | - map.put("name", "产筛人数"); | |
| 1177 | - map.put("type", "bar"); | |
| 1178 | - map.put("data", csItems); | |
| 1179 | - series.add(map); | |
| 1180 | 1162 | |
| 1181 | - DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); | |
| 1182 | - diagnosisQuery.setHospitalIds(currentUserHospPermissions); | |
| 1183 | - | |
| 1184 | - if (dates != null) { | |
| 1185 | - diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0])); | |
| 1186 | - if (dates.length == 2) { | |
| 1187 | - diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); | |
| 1188 | - } | |
| 1189 | - } | |
| 1190 | - | |
| 1191 | - int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery); | |
| 1192 | - List<String> dItems = new ArrayList<>(); | |
| 1193 | - csItems.add(String.valueOf(diagnosisCount)); | |
| 1194 | - Map<String, Object> dMap = new HashMap(); | |
| 1195 | - dMap.put("name", "诊断人数"); | |
| 1196 | - dMap.put("type", "bar"); | |
| 1197 | - dMap.put("data", dItems); | |
| 1198 | - series.add(dMap); | |
| 1199 | - | |
| 1200 | 1163 | List<List<String>> result = new ArrayList<>(); |
| 1201 | 1164 | |
| 1202 | -// List<String> titles = new ArrayList<>(); | |
| 1203 | -// titles.add("序号"); | |
| 1204 | -// titles.add("地市名称"); | |
| 1205 | -// titles.add("机构数"); | |
| 1206 | -// titles.add("应筛查人数"); | |
| 1207 | -// titles.add("产筛总数"); | |
| 1208 | -// titles.add("诊断总人数"); | |
| 1209 | -// result.add(titles); | |
| 1210 | - | |
| 1211 | 1165 | int num = 1; |
| 1212 | 1166 | if (CollectionUtils.isNotEmpty(configList)) |
| 1213 | 1167 | { |
| 1214 | - | |
| 1215 | 1168 | for (BasicConfig c : configList) { |
| 1169 | + SieveQuery sieveQuery = new SieveQuery(); | |
| 1170 | + sieveQuery.setHospitalIds(currentUserHospPermissions); | |
| 1171 | + sieveQuery.setYn(YnEnums.YES.getId()); | |
| 1172 | + sieveQuery.setStatus(3); | |
| 1173 | + if (dates != null) { | |
| 1174 | + sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0])); | |
| 1175 | + if (dates.length == 2) { | |
| 1176 | + sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); | |
| 1177 | + } | |
| 1178 | + } | |
| 1179 | + | |
| 1180 | + int sieveFinishCount = sieveService.queryListCount(sieveQuery); | |
| 1181 | + List<String> csItems = new ArrayList<>(); | |
| 1182 | + csItems.add(String.valueOf(sieveFinishCount)); | |
| 1183 | + Map<String, Object> map = new HashMap(); | |
| 1184 | + map.put("name", "产筛人数"); | |
| 1185 | + map.put("type", "bar"); | |
| 1186 | + map.put("data", csItems); | |
| 1187 | + series.add(map); | |
| 1188 | + | |
| 1189 | + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); | |
| 1190 | + diagnosisQuery.setHospitalIds(currentUserHospPermissions); | |
| 1191 | + | |
| 1192 | + if (dates != null) { | |
| 1193 | + diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0])); | |
| 1194 | + if (dates.length == 2) { | |
| 1195 | + diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); | |
| 1196 | + } | |
| 1197 | + } | |
| 1198 | + | |
| 1199 | + int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery); | |
| 1200 | + List<String> dItems = new ArrayList<>(); | |
| 1201 | + dItems.add(String.valueOf(diagnosisCount)); | |
| 1202 | + Map<String, Object> dMap = new HashMap(); | |
| 1203 | + dMap.put("name", "诊断人数"); | |
| 1204 | + dMap.put("type", "bar"); | |
| 1205 | + dMap.put("data", dItems); | |
| 1206 | + series.add(dMap); | |
| 1207 | + | |
| 1208 | + | |
| 1209 | + | |
| 1216 | 1210 | List<String> items = new ArrayList<>(); |
| 1217 | 1211 | items.add(String.valueOf(num)); |
| 1218 | 1212 | items.add(c.getName()); |
| ... | ... | @@ -1271,6 +1265,7 @@ |
| 1271 | 1265 | int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1); |
| 1272 | 1266 | items.add(String.valueOf(diagnosisCountAll)); |
| 1273 | 1267 | num++; |
| 1268 | + result.add(items); | |
| 1274 | 1269 | } |
| 1275 | 1270 | } |
| 1276 | 1271 | |
| ... | ... | @@ -1278,6 +1273,7 @@ |
| 1278 | 1273 | datas.put("series", series); |
| 1279 | 1274 | datas.put("xAxis", xAxis); |
| 1280 | 1275 | datas.put("legend", titleItems); |
| 1276 | + datas.put("tableDatas", result); | |
| 1281 | 1277 | return new BaseObjectResponse() |
| 1282 | 1278 | .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas); |
| 1283 | 1279 | } |