From 01b8d6a0af5c9198a71dfd355f04153049d445a3 Mon Sep 17 00:00:00 2001
From: ccsens_zhengzhichuan <ccsens_zhengzhichuan>
Date: Wed, 21 Jan 2026 02:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8D=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/persist/dao/ClientEvaDao.java      |  2 ++
 .../service/impl/AmsReportServiceImpl.java    | 26 ++++++++++++++++---
 .../resources/mapper/dao/ClientEvaDao.xml     | 10 +++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java
index 591629d..4153b3e 100644
--- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java
+++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/persist/dao/ClientEvaDao.java
@@ -45,4 +45,6 @@ public interface ClientEvaDao {
      */
     ClientEvaVo.ReportView getTzbsResult(@Param("evaId") Long evaId,
                                          @Param("code") String code);
+
+    List<String> queryYsfaList(@Param("scaleCode") String scaleCode);
 }
diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java
index 4bec004..c783204 100644
--- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java
+++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java
@@ -6,7 +6,9 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
 import com.ccsens.client.persist.dao.AmsDao;
+import com.ccsens.client.persist.dao.ClientEvaDao;
 import com.ccsens.client.service.AmsReportService;
 import com.ccsens.client.service.IReportInfoService;
 import com.ccsens.client.service.IRmsService;
@@ -72,6 +74,8 @@ public class AmsReportServiceImpl implements AmsReportService {
     private HmsDoctorSignMapper hmsDoctorSignMapper;
     @Resource
     private HmsVersionMapper hmsVersionMapper;
+    @Resource
+    private ClientEvaDao clientEvaDao;
     @Value("${file.grPath}")
     private String grPath;
     @Value("${file.ysPath}")
@@ -723,7 +727,7 @@ public class AmsReportServiceImpl implements AmsReportService {
                 row1 = Rows.of(
                         scores.get(i).getName(),
                         scores.get(i).getScore() == null ? "" : scores.get(i).getScore() + "",
-                        StrUtil.isEmpty(impression) ? qmsScaleAssConf == null ? null : qmsScaleAssConf.getResult() : impression
+                        StrUtil.isEmpty(impression) ? qmsScaleAssConf == null ? StrUtil.isEmpty(scores.get(i).getImpression()) ? null : scores.get(i).getImpression() : qmsScaleAssConf.getResult() : impression
                 ).create();
             }
             //查询类型
@@ -823,6 +827,22 @@ public class AmsReportServiceImpl implements AmsReportService {
                         params.put("fzjyFlag" + i, true);
                     }
                 }
+
+                //添加中医体质辨识防治建议
+                if ("TZBS_BZ".equals(scores.get(i).getCode()) || "TZBS_LN".equals(scores.get(i).getCode())) {
+                    //查询防治建议
+                    List<String> list1 = clientEvaDao.queryYsfaList(scores.get(i).getCode());
+                    if (CollUtil.isNotEmpty(list1)) {
+                        String ysfas = list1.get(0);
+                        for (String ysfa : list1) {
+                            ysfas += HtmlUtil.unescape(ysfa);
+                        }
+                        params.put("fzjy_" + i, ysfas);
+                        params.put("fzjyFlag" + i, true);
+                    }
+
+                }
+
                 params.put("table_" + i, tableData);
                 params.put("flag" + i, true);
             }
@@ -1069,8 +1089,8 @@ public class AmsReportServiceImpl implements AmsReportService {
                 TextRenderData textStr = Texts.of(str).bold().create();
                 TextRenderData textName = Texts.of(scores.get(i).getName()).bold().create();
                 TextRenderData textScore = Texts.of(scores.get(i).getScore() == null ? "" : scores.get(i).getScore() + "").bold().create();
-                TextRenderData textImpression = Texts.of(qmsScaleAssConf == null ? null : qmsScaleAssConf.getResult()).bold().create();
-
+                //中医体质辨识添加结论  结论为初步印象
+                TextRenderData textImpression = Texts.of(qmsScaleAssConf == null ? "TZBS_LN".equals(scores.get(i).getCode()) || "TZBS_BZ".equals(scores.get(i).getCode()) ? scores.get(i).getImpression() : null : qmsScaleAssConf.getResult()).bold().create();
                 //查询一二级套餐
                 RowRenderData row1 = Rows.of(
                         textStr,
diff --git a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml
index 85465e7..df781ce 100644
--- a/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml
+++ b/ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ClientEvaDao.xml
@@ -115,4 +115,14 @@
         <collection property="questionList" ofType="java.lang.String">
         </collection>
     </resultMap>
+
+    <select id="queryYsfaList" resultType="java.lang.String">
+        select
+            y.consti_ysfa_template
+        from
+            tzbs_qms_scale_consti c
+                left join tzbs_qms_scale_consti_ysfa y on c.consti_code = y.consti_code and y.del_flag = 0
+        where
+            c.scale_code = #{scaleCode}
+    </select>
 </mapper>
\ No newline at end of file