Commit 7f3f4d7c78dd537b69994516d2572b1eb494c48b
1 parent
bdbe55f51e
Exists in
master
and in
1 other branch
孕妇分娩后 变成产妇
Showing 1 changed file with 6 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
7f3f4d7
| ... | ... | @@ -390,6 +390,7 @@ |
| 390 | 390 | public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest,Integer userId) { |
| 391 | 391 | |
| 392 | 392 | Patients patients = null; |
| 393 | + Patients patients1 = null; | |
| 393 | 394 | if (!StringUtils.isEmpty(queryRequest.getPatientId())) { |
| 394 | 395 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 395 | 396 | patientsQuery.setId(queryRequest.getPatientId()); |
| ... | ... | @@ -398,6 +399,7 @@ |
| 398 | 399 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
| 399 | 400 | if (CollectionUtils.isNotEmpty(list)) { |
| 400 | 401 | patients = list.get(0); |
| 402 | + patients1=patients; | |
| 401 | 403 | } |
| 402 | 404 | } else { |
| 403 | 405 | List<Integer> list1 =autoMatchFacade.matchOrgId(userId); |
| ... | ... | @@ -407,6 +409,7 @@ |
| 407 | 409 | } |
| 408 | 410 | //查询产妇数据 |
| 409 | 411 | patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(),null, hospital); |
| 412 | + patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(),null, null); | |
| 410 | 413 | } |
| 411 | 414 | |
| 412 | 415 | if (null == patients) { |
| ... | ... | @@ -415,7 +418,7 @@ |
| 415 | 418 | |
| 416 | 419 | AntexListResult antexListResult = new AntexListResult(); |
| 417 | 420 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 418 | - antExChuQuery.setParentId(patients.getId()); | |
| 421 | + antExChuQuery.setParentId(patients1.getId()); | |
| 419 | 422 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 420 | 423 | //获取初诊记录 |
| 421 | 424 | List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| ... | ... | @@ -424,7 +427,7 @@ |
| 424 | 427 | antExChuModel = antExChulist.get(0); |
| 425 | 428 | } |
| 426 | 429 | //查询产前检查记录 |
| 427 | - List list = antenatalExaminationService.findAllByParentId(patients.getId()); | |
| 430 | + List list = antenatalExaminationService.findAllByParentId(patients1.getId()); | |
| 428 | 431 | List data = new ArrayList(); |
| 429 | 432 | if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { |
| 430 | 433 | List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); |
| ... | ... | @@ -432,7 +435,7 @@ |
| 432 | 435 | } |
| 433 | 436 | |
| 434 | 437 | antexListResult.convertToResult(list, patients, antExChulist); |
| 435 | - antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); | |
| 438 | + antexListResult.setIsSieve(cap(patients.getLastMenses(), patients1.getId())); | |
| 436 | 439 | antexListResult.setRiskFactor(data); |
| 437 | 440 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); |
| 438 | 441 | } |