Commit d4c0fa0871daf778e0abbe6d3774e401b8819cd0
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
d4c0fa0
| ... | ... | @@ -714,7 +714,7 @@ |
| 714 | 714 | public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) { |
| 715 | 715 | |
| 716 | 716 | Map<String,Object> map = new HashMap<>(); |
| 717 | - String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 717 | + //String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 718 | 718 | |
| 719 | 719 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 720 | 720 | patientsQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -722,6 +722,11 @@ |
| 722 | 722 | |
| 723 | 723 | List<Patients> localPatients = patientsService.queryPatient(patientsQuery); |
| 724 | 724 | |
| 725 | + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); | |
| 726 | + sieveApplyOrderQuery1.setParentId(parentId); | |
| 727 | + | |
| 728 | + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); | |
| 729 | + | |
| 725 | 730 | if (CollectionUtils.isNotEmpty(localPatients)) |
| 726 | 731 | { |
| 727 | 732 | Patients pat = localPatients.get(0); |
| 728 | 733 | |
| ... | ... | @@ -731,13 +736,10 @@ |
| 731 | 736 | patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); |
| 732 | 737 | patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); |
| 733 | 738 | |
| 739 | + sieveApplyOrderQuery1.setHospitalId(pat.getHospitalId()); | |
| 740 | + | |
| 734 | 741 | map.put("patientInfo", patientBaseResult); |
| 735 | 742 | } |
| 736 | - | |
| 737 | - SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); | |
| 738 | - sieveApplyOrderQuery1.setParentId(parentId); | |
| 739 | - sieveApplyOrderQuery1.setHospitalId(hospitalId); | |
| 740 | - sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); | |
| 741 | 743 | |
| 742 | 744 | if (type == 4) |
| 743 | 745 | { |