jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 80e00bca04e347a77bccd3c4800e5db6123edee6

Authored by litao@lymsh.com
1 parent b527be3378
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

bbbbbb

Showing 1 changed file with 48 additions and 46 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 80e00bc
... ... @@ -574,53 +574,7 @@
574 574 boolean tzFlag = CollectionUtils.isEmpty(antExChuModels) || StringUtils.isEmpty(antExChuModels.get(antExChuModels.size() - 1).getYqWeight()) || StringUtils.isEmpty(antExChuModels.get(antExChuModels.size() - 1).getHeight()) ? false : true;
575 575  
576 576  
577   - for (AntenatalExaminationModel antexModel : antexModels) {
578   - Map<String, Object> temp = new HashMap<>();
579   - Integer week = DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate());
580   - temp.put("checkTime", DateUtil.getyyyy_MM_dd(antexModel.getCheckDate()));
581   - temp.put("week", DateUtil.getWeekDesc(p.get(0).getLastMenses(), antexModel.getCheckDate()));
582   - temp.put("weight", antexModel.getWeight());
583   - temp.put("bp", parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), "--") + "/" + parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), "--"));
584   - temp.put("gonggao", StringUtils.isEmpty(antexModel.getGongGao()) ? GongJingEnums.GongGao.getName(antexModel.getGongGaoSelect()) + "/" + GongJingEnums.HengZhi.getName(antexModel.getGongGaoType()) : antexModel.getGongGao());
585   - if(temp.get("gonggao").toString().equals("--/--")) {
586   - temp.put("gonggao", "--");
587   - }
588   - temp.put("abdominalCircumference", antexModel.getAbdominalCircumference());// 腹围
589 577  
590   - List<Map> tireData = antexModel.getTireData();
591   - StringBuffer fetalPosition2 = new StringBuffer(); // 胎位
592   - StringBuffer heartRate2 = new StringBuffer(); // 胎心
593   - StringBuffer fetalPresentation2 = new StringBuffer(); // 先露
594   - if(CollectionUtils.isNotEmpty(tireData)) {
595   - for (Map tireDatum : tireData) {
596   - if(fetalPosition2.length() > 0) fetalPosition2.append("/");
597   - if(heartRate2.length() > 0) heartRate2.append("/");
598   - if(fetalPresentation2.length() > 0) fetalPresentation2.append("/");
599   - fetalPosition2.append(tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--");
600   - heartRate2.append(tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--");
601   - fetalPresentation2.append(tireDatum.containsKey("fetalPresentation") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--");
602   - }
603   - } else {
604   - fetalPosition2.append("--");
605   - heartRate2.append("--");
606   - fetalPresentation2.append("--");
607   - }
608   - temp.put("fetalPosition", fetalPosition2.toString()); // 胎位
609   - temp.put("heartRate", heartRate2.toString()); // 胎心
610   - temp.put("fetalPresentation", fetalPresentation2.toString()); // 先露
611   - temp.put("edema",FuZhongEnums.getName(antexModel.getEdema())); // 水肿
612   - temp.put("urineProtein", antexModel.getUrineProtein()); // 尿蛋白
613   - temp.put("hemoglobin", antexModel.getHemoglobin()); // 血红素
614   -
615   - ssy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), 0));
616   - szy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), 0));
617   - if(tzFlag && antexModel.getWeight() != null) {
618   - weights.put(DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate()), antexModel.getWeight() + "");
619   - }
620   -
621   - restList.add(temp);
622   - }
623   -
624 578 // 添加初诊list
625 579  
626 580 for (AntExChuModel antExChuModel : antExChuModels) {
... ... @@ -677,6 +631,54 @@
677 631 restList.add(temp);
678 632  
679 633 }
  634 +
  635 + for (AntenatalExaminationModel antexModel : antexModels) {
  636 + Map<String, Object> temp = new HashMap<>();
  637 + Integer week = DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate());
  638 + temp.put("checkTime", DateUtil.getyyyy_MM_dd(antexModel.getCheckDate()));
  639 + temp.put("week", DateUtil.getWeekDesc(p.get(0).getLastMenses(), antexModel.getCheckDate()));
  640 + temp.put("weight", antexModel.getWeight());
  641 + temp.put("bp", parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), "--") + "/" + parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), "--"));
  642 + temp.put("gonggao", StringUtils.isEmpty(antexModel.getGongGao()) ? GongJingEnums.GongGao.getName(antexModel.getGongGaoSelect()) + "/" + GongJingEnums.HengZhi.getName(antexModel.getGongGaoType()) : antexModel.getGongGao());
  643 + if(temp.get("gonggao").toString().equals("--/--")) {
  644 + temp.put("gonggao", "--");
  645 + }
  646 + temp.put("abdominalCircumference", antexModel.getAbdominalCircumference());// 腹围
  647 +
  648 + List<Map> tireData = antexModel.getTireData();
  649 + StringBuffer fetalPosition2 = new StringBuffer(); // 胎位
  650 + StringBuffer heartRate2 = new StringBuffer(); // 胎心
  651 + StringBuffer fetalPresentation2 = new StringBuffer(); // 先露
  652 + if(CollectionUtils.isNotEmpty(tireData)) {
  653 + for (Map tireDatum : tireData) {
  654 + if(fetalPosition2.length() > 0) fetalPosition2.append("/");
  655 + if(heartRate2.length() > 0) heartRate2.append("/");
  656 + if(fetalPresentation2.length() > 0) fetalPresentation2.append("/");
  657 + fetalPosition2.append(tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--");
  658 + heartRate2.append(tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--");
  659 + fetalPresentation2.append(tireDatum.containsKey("fetalPresentation") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--");
  660 + }
  661 + } else {
  662 + fetalPosition2.append("--");
  663 + heartRate2.append("--");
  664 + fetalPresentation2.append("--");
  665 + }
  666 + temp.put("fetalPosition", fetalPosition2.toString()); // 胎位
  667 + temp.put("heartRate", heartRate2.toString()); // 胎心
  668 + temp.put("fetalPresentation", fetalPresentation2.toString()); // 先露
  669 + temp.put("edema",FuZhongEnums.getName(antexModel.getEdema())); // 水肿
  670 + temp.put("urineProtein", antexModel.getUrineProtein()); // 尿蛋白
  671 + temp.put("hemoglobin", antexModel.getHemoglobin()); // 血红素
  672 +
  673 + ssy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), 0));
  674 + szy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), 0));
  675 + if(tzFlag && antexModel.getWeight() != null) {
  676 + weights.put(DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate()), antexModel.getWeight() + "");
  677 + }
  678 +
  679 + restList.add(temp);
  680 + }
  681 +
680 682  
681 683 if(tzFlag) {
682 684 for (AntExChuModel antExChuModel : antExChuModels) {