From b4d9f671e2dfd648797eb429e447a56c1a2d4fc8 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Mon, 18 Mar 2024 17:48:55 +0800
Subject: [PATCH] =?UTF-8?q?Fr200=20=E5=A2=9E=E5=8A=A0=E4=BB=AA=E5=99=A8?=
 =?UTF-8?q?=E6=8A=A4=E7=90=86=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=A8=A1=E5=BC=8F=E8=B7=B3=E8=BD=AC=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/entity/WxNursingLog.java      | 26 +++++++++++++++++++
 .../core/domain/req/WxNursingLogReq.java      | 12 +++++++++
 .../resources/mapper/WxNursingLogMapper.xml   |  6 ++++-
 .../service/impl/WxNursingLogServiceImpl.java | 14 ++++++++++
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java
index 3d421bb..bf75f6d 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java
@@ -145,6 +145,16 @@ public class WxNursingLog extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date instrumentBindingTime;
 
+    /**
+     * 仪器生成的护理数据，比如 FR200 的能量图谱
+     */
+    private String nursingData;
+
+    /**
+     * 控制页面调整到哪个护理页
+     */
+    private Integer jumpType;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -417,4 +427,20 @@ public class WxNursingLog extends BaseEntity {
     public void setInstrumentModeName(String instrumentModeName) {
         this.instrumentModeName = instrumentModeName;
     }
+
+    public String getNursingData() {
+        return nursingData;
+    }
+
+    public void setNursingData(String nursingData) {
+        this.nursingData = nursingData;
+    }
+
+    public Integer getJumpType() {
+        return jumpType;
+    }
+
+    public void setJumpType(Integer jumpType) {
+        this.jumpType = jumpType;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java
index bf3e83e..4f32008 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java
@@ -52,6 +52,10 @@ public class WxNursingLogReq {
      */
     private Double completionPercentage;
 
+    /**
+     * 仪器生成的护理数据，比如 FR200 的能量图谱
+     */
+    private String nursingData;
 
     public void setInstrumentId(Long instrumentId) {
         this.instrumentId = instrumentId;
@@ -100,4 +104,12 @@ public class WxNursingLogReq {
     public void setCompletionPercentage(Double completionPercentage) {
         this.completionPercentage = completionPercentage;
     }
+
+    public String getNursingData() {
+        return nursingData;
+    }
+
+    public void setNursingData(String nursingData) {
+        this.nursingData = nursingData;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml
index bb625c9..c994c05 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml
@@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nursingDaysWeek"    column="nursing_days_week"    />
         <result property="nursingDaysMonth"    column="nursing_days_month"    />
         <result property="nursingDaysYear"    column="nursing_days_year"    />
+        <result property="nursingData"    column="nursing_data"    />
     </resultMap>
 
     <sql id="selectWxNursingLogVo">
-        select id, user_id, instrument_id, instrument_name, online, mode_id, mode_name, nursing_time, completion_percentage, status, create_by, create_time, update_by, update_time, nursing_days, nursing_days_week, nursing_days_month, nursing_days_year from wx_nursing_log
+        select id, user_id, instrument_id, instrument_name, online, mode_id, mode_name, nursing_time, completion_percentage, status, create_by, create_time, update_by, update_time, nursing_days, nursing_days_week, nursing_days_month, nursing_days_year, nursing_data from wx_nursing_log
     </sql>
 
     <select id="selectWxNursingLogList" parameterType="WxNursingLog" resultMap="WxNursingLogResult">
@@ -131,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nursingDaysWeek != null">nursing_days_week,</if>
             <if test="nursingDaysMonth != null">nursing_days_month,</if>
             <if test="nursingDaysYear != null">nursing_days_year,</if>
+            <if test="nursingData != null">nursing_data,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -150,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nursingDaysWeek != null">#{nursingDaysWeek},</if>
             <if test="nursingDaysMonth != null">#{nursingDaysMonth},</if>
             <if test="nursingDaysYear != null">#{nursingDaysYear},</if>
+            <if test="nursingData != null">#{nursingData},</if>
          </trim>
     </insert>
 
@@ -173,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nursingDaysWeek != null">nursing_days_week = #{nursingDaysWeek},</if>
             <if test="nursingDaysMonth != null">nursing_days_month = #{nursingDaysMonth},</if>
             <if test="nursingDaysYear != null">nursing_days_year = #{nursingDaysYear},</if>
+            <if test="nursingData != null">nursing_days_year = #{nursingData},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java
index 2b544cc..ad85711 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java
@@ -94,6 +94,20 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
                     nursingLog.setInstrumentType(wxInstrument.getType());
                     nursingLog.setInstrumentName(wxInstrument.getName());
                 }
+
+                // 由于每个模式的护理报告页都不同，加个字段控制页面跳转
+                // 通过字典的排序值来设定：0（默认列表页），其他数值就是 字典标签
+                List<SysDictData> fr200ModeList = DictUtils.getDictCache("instrument_model_type_fr200");
+                if (StringUtils.equals(wxInstrument.getModel(), "FR200")) {
+                    for (SysDictData sysDictData : fr200ModeList) {
+                        if (StringUtils.equals(sysDictData.getDictValue(), wxMode.getModeType())) {
+                            nursingLog.setJumpType(sysDictData.getDictSort().intValue());
+                        }
+                    }
+                } else {
+                    //其他仪器类型，暂时都是跳转默认页面
+                    nursingLog.setJumpType(0);
+                }
             }
         }
         return wxNursingLogList;