Merge branch 'master' into master-dev

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java

@@ -297,6 +297,8 @@ public class RmsServiceImpl implements IRmsService {
                     reportScaleScoreMap.put(score.getCode(), rmsReportScaleScores.get(0));
                 }
                 if ("TZBS_LN".equals(score.getCode()) || "TZBS_BZ".equals(score.getCode())) {
+                    score.setSubReport(new ArrayList<>());
+                    zytzbs(dto.getEvaluationId(), score);
 //                    添加体质辨识结论
                     List<TzbsRmsReportResult> reportResultList = score.getReportResultList();
                     if (CollUtil.isNotEmpty(reportResultList)) {
@@ -314,6 +316,12 @@ public class RmsServiceImpl implements IRmsService {
                             rmsReportYsjyMapper.insertSelective(reportResult);
                         });
                     }
+
+                    ClientEvaVo.ReportView reportView = reportView(dto.getEvaluationId(), score.getCode());
+                    if (reportView != null) {
+                        score.setImpression(reportView.getResult());
+                        score.setScore(reportView.getTotalScore());
+                    }
                 }
                 //添加量表分数统计
                 RmsReportScaleScore reportScaleScore = new RmsReportScaleScore();
@@ -321,6 +329,7 @@ public class RmsServiceImpl implements IRmsService {
                 reportScaleScore.setReportId(report.getId());
                 reportScaleScore.setScaleCode(score.getCode());
                 reportScaleScore.setResult(score.getImpression());
+                reportScaleScore.setImpression(score.getImpression());
                 reportScaleScore.setScore(score.getScore());
                 reportScaleScore.setIsShow((byte) 1);
                 reportScaleScore.setComboId(score.getComboId());
@@ -474,6 +483,14 @@ public class RmsServiceImpl implements IRmsService {
                         score.setScoreDistributions(distributions);
                     }
                 }
+
+                if ("TZBS_LN".equals(score.getCode()) || "TZBS_BZ".equals(score.getCode())) {
+                    ClientEvaVo.ReportView reportView = reportView(dto.getEvaluationId(), score.getCode());
+                    if (reportView != null) {
+                        score.setImpression(reportView.getResult());
+                        score.setScore(reportView.getTotalScore());
+                    }
+                }
             }
         }
 
@@ -567,6 +584,7 @@ public class RmsServiceImpl implements IRmsService {
         //3.2 生成报告单辨识结果
         List<ReportVo.EvaResult> resultList = countReportResult(evaluationId, score.getCode());
         List<TzbsRmsReportResult> reportResultList = CollectionUtil.newArrayList();
+        BigDecimal totalScore = BigDecimal.ZERO;
         for (ReportVo.EvaResult resultVo : resultList) {
             //转换为RmsReportResult对象
             TzbsRmsReportResult reportResult = new TzbsRmsReportResult();
@@ -586,7 +604,9 @@ public class RmsServiceImpl implements IRmsService {
             reportScore.setScore(reportResult.getConstiScore());
             reportScore.setTotalScore(score.getTotalScore());
             score.addSub(reportScore);
+            totalScore = totalScore.add(reportScore.getScore());
         }
+        score.setScore(totalScore);
         score.setReportResultList(reportResultList);
 
         //3.3 生成养生建议