Commit f73507799acebcb32c650c055e4fbc8556ea3f34
1 parent
62c53249cf
Exists in
master
and in
6 other branches
产筛
Showing 1 changed file with 8 additions and 30 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
f735077
| ... | ... | @@ -718,44 +718,22 @@ |
| 718 | 718 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 719 | 719 | |
| 720 | 720 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 721 | - patientsQuery.setHospitalId(hospitalId); | |
| 722 | 721 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 723 | 722 | patientsQuery.setId(parentId); |
| 724 | 723 | |
| 725 | 724 | List<Patients> localPatients = patientsService.queryPatient(patientsQuery); |
| 726 | - Patients pat = null; | |
| 725 | + | |
| 727 | 726 | if (CollectionUtils.isNotEmpty(localPatients)) |
| 728 | 727 | { |
| 729 | - pat = localPatients.get(0); | |
| 730 | - } | |
| 731 | - else | |
| 732 | - { | |
| 733 | - patientsQuery.setHospitalId(null); | |
| 734 | - List<Patients> areaPatients = patientsService.queryPatient(patientsQuery); | |
| 735 | - if (CollectionUtils.isNotEmpty(areaPatients)) { | |
| 736 | - pat = areaPatients.get(0); | |
| 737 | - if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { | |
| 738 | - //建立隐藏档案 | |
| 739 | - String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1); | |
| 740 | - | |
| 741 | - pat = patientsService.findOnePatientById(id); | |
| 742 | - } | |
| 743 | - else | |
| 744 | - { | |
| 745 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛"); | |
| 746 | - } | |
| 747 | - } | |
| 748 | - } | |
| 749 | - | |
| 750 | - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); | |
| 751 | - PatientBaseResult patientBaseResult = new PatientBaseResult(); | |
| 752 | - if (null != pat) { | |
| 728 | + Patients pat = localPatients.get(0); | |
| 729 | + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); | |
| 730 | + PatientBaseResult patientBaseResult = new PatientBaseResult(); | |
| 753 | 731 | patientBaseResult.convert(pat); |
| 754 | - } | |
| 755 | - patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); | |
| 756 | - patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); | |
| 732 | + patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); | |
| 733 | + patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); | |
| 757 | 734 | |
| 758 | - map.put("patientInfo", patientBaseResult); | |
| 735 | + map.put("patientInfo", patientBaseResult); | |
| 736 | + } | |
| 759 | 737 | |
| 760 | 738 | SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); |
| 761 | 739 | sieveApplyOrderQuery1.setParentId(parentId); |