Commit 2ad1f055bc4e34573b2bb9136a54a82d91e2975a
1 parent
179c029e3f
Exists in
master
and in
6 other branches
筛查统计修改
Showing 2 changed files with 33 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
View file @
2ad1f05
| ... | ... | @@ -88,6 +88,16 @@ |
| 88 | 88 | private String applyHospitalId; |
| 89 | 89 | private List<String> parentIds; |
| 90 | 90 | |
| 91 | + private List<Integer> statuses; | |
| 92 | + | |
| 93 | + public List<Integer> getStatuses() { | |
| 94 | + return statuses; | |
| 95 | + } | |
| 96 | + | |
| 97 | + public void setStatuses(List<Integer> statuses) { | |
| 98 | + this.statuses = statuses; | |
| 99 | + } | |
| 100 | + | |
| 91 | 101 | public Date getCreatedStart() { |
| 92 | 102 | return createdStart; |
| 93 | 103 | } |
| ... | ... | @@ -331,6 +341,11 @@ |
| 331 | 341 | if (null != status) { |
| 332 | 342 | condition = condition.and("status", status, MongoOper.IS); |
| 333 | 343 | } |
| 344 | + | |
| 345 | + if (null != statuses && statuses.size() > 0) { | |
| 346 | + condition = condition.and("status", statuses, MongoOper.IN); | |
| 347 | + } | |
| 348 | + | |
| 334 | 349 | if (null != renShenResult) { |
| 335 | 350 | condition = condition.and("renShenResult", renShenResult, MongoOper.IS); |
| 336 | 351 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
2ad1f05
| ... | ... | @@ -1225,7 +1225,10 @@ |
| 1225 | 1225 | SieveQuery sieveQuery = new SieveQuery(); |
| 1226 | 1226 | sieveQuery.setHospitalIds(hids); |
| 1227 | 1227 | sieveQuery.setYn(YnEnums.YES.getId()); |
| 1228 | - sieveQuery.setStatus(3); | |
| 1228 | + List<Integer> statues = new ArrayList<>(); | |
| 1229 | + statues.add(3); | |
| 1230 | + statues.add(4); | |
| 1231 | + sieveQuery.setStatuses(statues); | |
| 1229 | 1232 | if (dates != null) { |
| 1230 | 1233 | sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0])); |
| 1231 | 1234 | if (dates.length == 2) { |
| ... | ... | @@ -1305,7 +1308,12 @@ |
| 1305 | 1308 | SieveQuery sieveQuery1 = new SieveQuery(); |
| 1306 | 1309 | sieveQuery1.setHospitalIds(hids); |
| 1307 | 1310 | sieveQuery1.setYn(YnEnums.YES.getId()); |
| 1308 | - sieveQuery1.setStatus(3); | |
| 1311 | + | |
| 1312 | + List<Integer> statues = new ArrayList<>(); | |
| 1313 | + statues.add(3); | |
| 1314 | + statues.add(4); | |
| 1315 | + sieveQuery1.setStatuses(statues); | |
| 1316 | + | |
| 1309 | 1317 | if (dates != null) { |
| 1310 | 1318 | sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0])); |
| 1311 | 1319 | if (dates.length == 2) { |
| ... | ... | @@ -1325,7 +1333,6 @@ |
| 1325 | 1333 | diagnosisQuery1.setResultDateEnd(DateUtil.parseYMDHMS(dates[1])); |
| 1326 | 1334 | } |
| 1327 | 1335 | } |
| 1328 | - System.out.println("diagnosisQuery1==="+diagnosisQuery1.convertToQuery().convertToMongoQuery()); | |
| 1329 | 1336 | int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1); |
| 1330 | 1337 | items.add(String.valueOf(diagnosisCountAll)); |
| 1331 | 1338 | } |
| ... | ... | @@ -1454,7 +1461,10 @@ |
| 1454 | 1461 | } |
| 1455 | 1462 | ySieveCount = sieveService.queryListCount(ySieveQuery); |
| 1456 | 1463 | |
| 1457 | - ySieveQuery.setStatus(3); | |
| 1464 | + List<Integer> statues = new ArrayList<>(); | |
| 1465 | + statues.add(3); | |
| 1466 | + statues.add(4); | |
| 1467 | + ySieveQuery.setStatuses(statues); | |
| 1458 | 1468 | sSieveCount = sieveService.queryListCount(ySieveQuery); |
| 1459 | 1469 | |
| 1460 | 1470 | |
| ... | ... | @@ -1764,7 +1774,10 @@ |
| 1764 | 1774 | SieveQuery sieveQuery1 = new SieveQuery(); |
| 1765 | 1775 | sieveQuery1.setHospitalId(hid); |
| 1766 | 1776 | sieveQuery1.setYn(YnEnums.YES.getId()); |
| 1767 | - sieveQuery1.setStatus(3); | |
| 1777 | + List<Integer> statues = new ArrayList<>(); | |
| 1778 | + statues.add(3); | |
| 1779 | + statues.add(4); | |
| 1780 | + sieveQuery1.setStatuses(statues); | |
| 1768 | 1781 | if (dates != null) { |
| 1769 | 1782 | sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0])); |
| 1770 | 1783 | if (dates.length == 2) { |