Commit af15b1eaad28b49a5981241053defc6bc7ae52ce
1 parent
cefd11c2e0
Exists in
master
and in
6 other branches
体重多产程问题修改
Showing 2 changed files with 17 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
af15b1e
| ... | ... | @@ -2156,7 +2156,8 @@ |
| 2156 | 2156 | patientsQuery.setCardNo(patientQueryRequest.getCardNo()); |
| 2157 | 2157 | patientsQuery.setVcCardNo(patientQueryRequest.getVcCardNo()); |
| 2158 | 2158 | |
| 2159 | - Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false); | |
| 2159 | + Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), | |
| 2160 | + patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), 1, false, patientQueryRequest.getPid(), false); | |
| 2160 | 2161 | PatientBaseResult patientBaseResult = new PatientBaseResult(); |
| 2161 | 2162 | if (null != patients) { |
| 2162 | 2163 | patientBaseResult.convert(patients); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
af15b1e
| ... | ... | @@ -251,7 +251,7 @@ |
| 251 | 251 | boolean flag = false; |
| 252 | 252 | List<String> hospital = groupsFacade.findGroupHospital(userId, false); |
| 253 | 253 | Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); |
| 254 | - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 254 | + Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospital).and("type").is(1); | |
| 255 | 255 | if (StringUtils.isNotBlank(key)) { |
| 256 | 256 | pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); |
| 257 | 257 | flag = true; |
| ... | ... | @@ -290,20 +290,20 @@ |
| 290 | 290 | for (PatientWeight patientWeight : patientWeights) { |
| 291 | 291 | Patients p = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); |
| 292 | 292 | if (p != null) { |
| 293 | - | |
| 294 | - if (p.getType() == 3) { | |
| 295 | - | |
| 296 | - PatientsQuery patientsQuery = new PatientsQuery(); | |
| 297 | - patientsQuery.setExtSource(false); | |
| 298 | - patientsQuery.setType(1); | |
| 299 | - patientsQuery.setYn(YnEnums.YES.getId()); | |
| 300 | - patientsQuery.setSort("created"); | |
| 301 | - patientsQuery.setPid(p.getPid()); | |
| 302 | - List<Patients> patients = patientsService.queryPatient(patientsQuery); | |
| 303 | - if (CollectionUtils.isNotEmpty(patients)) { | |
| 304 | - p = patients.get(0); | |
| 305 | - } | |
| 306 | - } | |
| 293 | +// | |
| 294 | +// if (p.getType() == 3) { | |
| 295 | +// | |
| 296 | +// PatientsQuery patientsQuery = new PatientsQuery(); | |
| 297 | +// patientsQuery.setExtSource(false); | |
| 298 | +// patientsQuery.setType(1); | |
| 299 | +// patientsQuery.setYn(YnEnums.YES.getId()); | |
| 300 | +// patientsQuery.setSort("created"); | |
| 301 | +// patientsQuery.setPid(p.getPid()); | |
| 302 | +// List<Patients> patients = patientsService.queryPatient(patientsQuery); | |
| 303 | +// if (CollectionUtils.isNotEmpty(patients)) { | |
| 304 | +// p = patients.get(0); | |
| 305 | +// } | |
| 306 | +// } | |
| 307 | 307 | |
| 308 | 308 | Map<String, Object> temp = new LinkedHashMap<>(); |
| 309 | 309 | temp.put("id", patientWeight.getId()); |