Commit 4ed89d82d4f70d144942e341f9fa82afd2c9e16c
1 parent
9b85c6bd65
Exists in
master
and in
6 other branches
筛查统计
Showing 1 changed file with 27 additions and 27 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
4ed89d8
| ... | ... | @@ -1342,12 +1342,29 @@ |
| 1342 | 1342 | basicQuery.setParentId(cityId); |
| 1343 | 1343 | |
| 1344 | 1344 | |
| 1345 | - int ySieveCount = 0; | |
| 1346 | - int sSieveCount = 0; | |
| 1345 | + | |
| 1347 | 1346 | //获取地址列表 |
| 1348 | 1347 | List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery); |
| 1349 | 1348 | for (BasicConfig bc : configList) |
| 1350 | 1349 | { |
| 1350 | + int ySieveCount = 0; | |
| 1351 | + int sSieveCount = 0; | |
| 1352 | + | |
| 1353 | + int st21Count = 0; | |
| 1354 | + int st1813Count = 0; | |
| 1355 | + int sjqxCount = 0; | |
| 1356 | + | |
| 1357 | + int sieveCount=0; | |
| 1358 | + | |
| 1359 | + int disCount = 0; | |
| 1360 | + int disExcCount = 0; | |
| 1361 | + int sjDisCount = 0; | |
| 1362 | + int sjDisExcCount = 0; | |
| 1363 | + //孕妇无创DNA检测 | |
| 1364 | + int dnaSieveCount = 0; | |
| 1365 | + int dnaSieveLowCount = 0; | |
| 1366 | + int dnaSieveHighCount = 0; | |
| 1367 | + | |
| 1351 | 1368 | Map<String,String> mapData = new LinkedHashMap<>(); |
| 1352 | 1369 | mapData.put("areaName", bc.getName());//县市区 |
| 1353 | 1370 | |
| ... | ... | @@ -1355,6 +1372,7 @@ |
| 1355 | 1372 | patientsQuery.setHospitalList(hospitalIds); |
| 1356 | 1373 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 1357 | 1374 | patientsQuery.setCityRegisterId(cityId); |
| 1375 | + patientsQuery.setAreaRegisterId(bc.getId()); | |
| 1358 | 1376 | List<Patients> patientses = patientsService.queryPatient(patientsQuery); |
| 1359 | 1377 | List<String> patientIds = new ArrayList<>(); |
| 1360 | 1378 | if (CollectionUtils.isNotEmpty(patientses)) |
| ... | ... | @@ -1363,6 +1381,11 @@ |
| 1363 | 1381 | { |
| 1364 | 1382 | patientIds.add(pat.getId()); |
| 1365 | 1383 | } |
| 1384 | + } | |
| 1385 | + | |
| 1386 | + if (CollectionUtils.isNotEmpty(patientIds)) | |
| 1387 | + { | |
| 1388 | + | |
| 1366 | 1389 | SieveQuery ySieveQuery = new SieveQuery(); |
| 1367 | 1390 | ySieveQuery.setParentIds(patientIds); |
| 1368 | 1391 | ySieveQuery.setHospitalIds(hospitalIds); |
| 1369 | 1392 | |
| 1370 | 1393 | |
| 1371 | 1394 | |
| ... | ... | @@ -1376,34 +1399,11 @@ |
| 1376 | 1399 | |
| 1377 | 1400 | ySieveQuery.setStatus(3); |
| 1378 | 1401 | sSieveCount = sieveService.queryListCount(ySieveQuery); |
| 1379 | - } | |
| 1380 | 1402 | |
| 1381 | - mapData.put("ysiveCount", String.valueOf(ySieveCount));//应筛查户籍人数 | |
| 1382 | - mapData.put("sSieveCount", String.valueOf(sSieveCount));//实筛查户籍人数 | |
| 1383 | 1403 | |
| 1384 | -// private String tszhz;// 唐氏综合症 | |
| 1385 | -// private String sjgjx;// 神经管畸形 | |
| 1386 | -// private String sbst;// 18-三体 | |
| 1387 | -// private String dzhpx;// 地中海贫血 | |
| 1388 | -// private String cspj;// 产筛评价 | |
| 1389 | -// private String stzhz13; //13-三体 | |
| 1390 | - int st21Count = 0; | |
| 1391 | - int st1813Count = 0; | |
| 1392 | - int sjqxCount = 0; | |
| 1404 | + mapData.put("ysiveCount", String.valueOf(ySieveCount));//应筛查户籍人数 | |
| 1405 | + mapData.put("sSieveCount", String.valueOf(sSieveCount));//实筛查户籍人数 | |
| 1393 | 1406 | |
| 1394 | - int sieveCount=0; | |
| 1395 | - | |
| 1396 | - int disCount = 0; | |
| 1397 | - int disExcCount = 0; | |
| 1398 | - int sjDisCount = 0; | |
| 1399 | - int sjDisExcCount = 0; | |
| 1400 | - //孕妇无创DNA检测 | |
| 1401 | - int dnaSieveCount = 0; | |
| 1402 | - int dnaSieveLowCount = 0; | |
| 1403 | - int dnaSieveHighCount = 0; | |
| 1404 | - | |
| 1405 | - if (CollectionUtils.isNotEmpty(patientIds)) | |
| 1406 | - { | |
| 1407 | 1407 | SieveResultQuery sieveResultQuery = new SieveResultQuery(); |
| 1408 | 1408 | if (dates != null) { |
| 1409 | 1409 | sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0])); |