Commit 4e04a9a35f2cae3adc8f934513a305339520765c
1 parent
c158986fd8
Exists in
master
and in
6 other branches
体重修改
Showing 1 changed file with 2 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
4e04a9a
... | ... | @@ -3026,13 +3026,7 @@ |
3026 | 3026 | } |
3027 | 3027 | |
3028 | 3028 | public BaseResponse findPatient2(PatientQueryRequest patientQueryRequest, Integer userId) { |
3029 | -// PatientsQuery patientsQuery = new PatientsQuery(); | |
3030 | -// patientsQuery.setPid(patientQueryRequest.getPid()); | |
3031 | -// patientsQuery.setId(patientQueryRequest.getId()); | |
3032 | -//// patientsQuery.setPhone(patientQueryRequest.getPhone()); | |
3033 | -// patientsQuery.setPhone(patientQueryRequest.getVcCardNo()); | |
3034 | -// patientsQuery.setCardNo(patientQueryRequest.getCardNo()); | |
3035 | -// patientsQuery.setVcCardNo(patientQueryRequest.getVcCardNo()); | |
3029 | + String hospitalId= autoMatchFacade.getHospitalId(userId); | |
3036 | 3030 | Integer type = patientQueryRequest.getType() != null ? patientQueryRequest.getType() : -1; |
3037 | 3031 | |
3038 | 3032 | Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), |
... | ... | @@ -3075,7 +3069,7 @@ |
3075 | 3069 | |
3076 | 3070 | PatientWeight pw = null; |
3077 | 3071 | // List<PatientWeight> pws = mongoTemplate.find(Query.query(Criteria.where("pid").is(patientBaseResult.getPid())), PatientWeight.class); |
3078 | - List<PatientWeight> pws = mongoTemplate.find(Query.query(Criteria.where("pid").is(patientBaseResult.getPid()).and("type").is(1)), PatientWeight.class); | |
3072 | + List<PatientWeight> pws = mongoTemplate.find(Query.query(Criteria.where("pid").is(patientBaseResult.getPid()).and("type").is(1).and("hospitalId").is(hospitalId)), PatientWeight.class); | |
3079 | 3073 | if (CollectionUtils.isNotEmpty(pws)) { |
3080 | 3074 | pw = pws.get(0); |
3081 | 3075 | patientBaseResult.setPwId(pw.getId()); |