jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2fbd25b18a9c22a7ffcc4e79d791d97ab81f790f

Authored by jiangjiazhi
1 parent a3b1f7d301
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

孕妇分娩后 变成产妇

Showing 1 changed file with 4 additions and 25 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 2fbd25b
... ... @@ -519,7 +519,6 @@
519 519 public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest, Integer userId) {
520 520  
521 521 Patients patients = null;
522   - Patients patients1 = null;
523 522 if (!StringUtils.isEmpty(queryRequest.getPatientId())) {
524 523 PatientsQuery patientsQuery = new PatientsQuery();
525 524 patientsQuery.setId(queryRequest.getPatientId());
... ... @@ -537,9 +536,6 @@
537 536 }
538 537 //查询产妇数据
539 538 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1);
540   - /* if (null == patients) {
541   - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null, 1);
542   - }*/
543 539 }
544 540  
545 541 if (null == patients) {
546 542  
547 543  
548 544  
... ... @@ -548,35 +544,18 @@
548 544  
549 545 AntexListResult antexListResult = new AntexListResult();
550 546 AntExChuQuery antExChuQuery = new AntExChuQuery();
551   - antExChuQuery.setPid(patients.getPid());
  547 + antExChuQuery.setParentId(patients.getId());
552 548 antExChuQuery.setYn(YnEnums.YES.getId());
553 549 //获取初诊记录
554 550 List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
555   - /* AntExChuModel antExChuModel = null;
556   - if (CollectionUtils.isNotEmpty(antExChulist)) {
557   - antExChuModel = antExChulist.get(0);
558   - }*/
  551 +
559 552 HighScoreResult highScoreResult = findLastRisk(patients.getId(),false);
560 553 AntExQuery antExQuery = new AntExQuery();
561 554 antExQuery.setYn(YnEnums.YES.getId());
562   - antExQuery.setPid(patients.getPid());
  555 + antExQuery.setParentId(patients.getId());
563 556 //查询产前检查记录
564 557 List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
565   - /* List data = new ArrayList();
566   - if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {
567   - List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
568   - data = queryRiskName(l);
569   - }
570   - if(CollectionUtils.isNotEmpty(list)){
571   - AntenatalExaminationModel antEx= list.get(0);
572   - try{
573   - if(!"{}".equals(antEx.getOtherRisk())){
574   - JsonUtil.str2Obj(antEx.getOtherRisk(), java.util.Map.class);
575   - }
576   - }catch (Exception e){
577   - }
578   - data.add();
579   - }*/
  558 +
580 559 antexListResult.convertToResult(list, patients, antExChulist);
581 560 antexListResult.setData(handlAntData(antExChulist, list));
582 561 antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));