Commit b528e75fc7db3791f47fa16f68b9d4d2d10bfe1a
1 parent
609bf0175c
Exists in
master
and in
6 other branches
1
Showing 1 changed file with 15 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
b528e75
| ... | ... | @@ -428,7 +428,11 @@ |
| 428 | 428 | } |
| 429 | 429 | } |
| 430 | 430 | } |
| 431 | - hospitalList.retainAll(orgId); | |
| 431 | + if (CollectionUtils.isEmpty(orgId)) { | |
| 432 | + hospitalList = new ArrayList<>(); | |
| 433 | + } else { | |
| 434 | + hospitalList.retainAll(orgId); | |
| 435 | + } | |
| 432 | 436 | } |
| 433 | 437 | patientsQuery.setHospitalList(hospitalList); |
| 434 | 438 | |
| ... | ... | @@ -453,7 +457,11 @@ |
| 453 | 457 | } |
| 454 | 458 | } |
| 455 | 459 | } |
| 456 | - fmHospitalList.retainAll(orgId); | |
| 460 | + if (CollectionUtils.isEmpty(orgId)) { | |
| 461 | + fmHospitalList = new ArrayList<>(); | |
| 462 | + } else { | |
| 463 | + fmHospitalList.retainAll(orgId); | |
| 464 | + } | |
| 457 | 465 | } |
| 458 | 466 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) { |
| 459 | 467 | patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital()); |
| ... | ... | @@ -487,7 +495,7 @@ |
| 487 | 495 | } |
| 488 | 496 | //丙肝查询 |
| 489 | 497 | if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.BINGGAN.getId())) { |
| 490 | - mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS).orCondition(new MongoCondition("bg","",MongoOper.NE))); | |
| 498 | + mongoCondits.add(new MongoCondition("bg", true, MongoOper.EXISTS).orCondition(new MongoCondition("bg", "", MongoOper.NE))); | |
| 491 | 499 | } |
| 492 | 500 | //梅毒查询 |
| 493 | 501 | if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.MEIDU.getId())) { |
| ... | ... | @@ -601,7 +609,7 @@ |
| 601 | 609 | //查询符合条件的孕妇 |
| 602 | 610 | StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); |
| 603 | 611 | stopWatch.start(); |
| 604 | - List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(),riskPatientsQueryRequest.getOrder()); | |
| 612 | + List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); | |
| 605 | 613 | stopWatch.stop(); |
| 606 | 614 | |
| 607 | 615 | logger.info(stopWatch.toString()); |
| ... | ... | @@ -759,7 +767,7 @@ |
| 759 | 767 | |
| 760 | 768 | //判断医院是否启动和对应的服务项是否启用 |
| 761 | 769 | SmsConfigModel configModel = new SmsConfigModel(); |
| 762 | - int startType = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId()); | |
| 770 | + int startType = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId()); | |
| 763 | 771 | if (startType == 0) { |
| 764 | 772 | BaseResponse objectResponse = new BaseResponse(); |
| 765 | 773 | objectResponse.setErrorcode(ErrorCodeConstants.NO_POWER); |
| ... | ... | @@ -1057,7 +1065,7 @@ |
| 1057 | 1065 | String dueWeek = ""; |
| 1058 | 1066 | try { |
| 1059 | 1067 | // 徐倩说改的 |
| 1060 | - if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { | |
| 1068 | + if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { | |
| 1061 | 1069 | // if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) { |
| 1062 | 1070 | dueWeek = "已分娩"; |
| 1063 | 1071 | } else { |
| ... | ... | @@ -1167,7 +1175,7 @@ |
| 1167 | 1175 | patientManagerQueryModel.setpId(patients.getPid()); |
| 1168 | 1176 | String dueWeek = ""; |
| 1169 | 1177 | try { |
| 1170 | - // && patients.getBuildType() == 2 | |
| 1178 | + // && patients.getBuildType() == 2 | |
| 1171 | 1179 | if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0) { |
| 1172 | 1180 | dueWeek = "已分娩"; |
| 1173 | 1181 | } else { |