jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1a003b7d4422526d9385bb3a31f419844bdec8d3

Authored by yangfei
2 parents 140929e083 5851995e0f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 1a003b7
... ... @@ -609,8 +609,8 @@
609 609 if(p == null) {
610 610 return RespBuilder.buildSuccess();
611 611 }
612   - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class);
613   - List<AntenatalExaminationModel> antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class);
  612 + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class);
  613 + List<AntenatalExaminationModel> antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class);
614 614  
615 615 Map<String, Object> xyMap = new HashMap<>();
616 616 List<Integer> szyMin = new ArrayList<>();
... ... @@ -652,9 +652,9 @@
652 652 String fetalPresentation = ""; // 先露
653 653 if(CollectionUtils.isNotEmpty(tireData)) {
654 654 for (Map tireDatum : tireData) {
655   - fetalPosition = fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + "";
656   - heartRate = heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + "";
657   - fetalPresentation = fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition"));
  655 + fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + "";
  656 + heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + "";
  657 + fetalPresentation = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition"));
658 658 }
659 659 } else {
660 660 fetalPosition = "--";
... ... @@ -694,9 +694,9 @@
694 694 String fetalPresentation = "";
695 695 if(CollectionUtils.isNotEmpty(tireData)) {
696 696 for (Map tireDatum : tireData) {
697   - fetalPosition = fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + "";
698   - heartRate = heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + "";
699   - fetalPresentation = fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition"));
  697 + fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + "";
  698 + heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + "";
  699 + fetalPresentation = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition"));
700 700 }
701 701 } else {
702 702 fetalPosition = "--";