FR200 水分测试报告历史记录

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxNursingLogMapper.java

@@ -29,6 +29,8 @@ public interface WxNursingLogMapper {
      */
     public List<WxNursingLog> selectWxNursingLogList(WxNursingLog wxNursingLog);
 
+    public List<WxNursingLog> fr200MoistureTestRecord(WxNursingLog wxNursingLog);
+
     public List<WxNursingLog> selectNursingLogListByVm(UserNursingLogVm userNursingLogVm);
 
     /**

flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml

@@ -52,6 +52,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY update_time DESC
     </select>
 
+    <select id="fr200MoistureTestRecord" parameterType="WxNursingLog" resultMap="WxNursingLogResult">
+        SELECT
+            nursing.*
+        FROM
+            wx_nursing_log nursing
+        LEFT JOIN wx_mode wxMode ON nursing.mode_id = wxMode.id AND wxMode.mode_type = "moistureTest"
+        <where>
+            <if test="userId != null "> and nursing.user_id = #{userId}</if>
+            <if test="instrumentId != null "> and nursing.instrument_id = #{instrumentId}</if>
+            <if test="params != null and params.endTime != null">
+                and nursing.create_time &lt;= #{params.endTime}
+            </if>
+        </where>
+    </select>
+
     <select id="selectNursingLogListByVm" parameterType="UserNursingLogVm" resultMap="WxNursingLogResult">
         <include refid="selectWxNursingLogVo"/>
         <where>

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxNursingLogController.java

@@ -41,6 +41,17 @@ public class WxNursingLogController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * FR200 水分测试报告历史记录
+     */
+    @GetMapping("/record/fr200/moistureTest")
+    public TableDataInfo fr200MoistureTestRecord(@RequestParam(value = "instrumentId") Long instrumentId,
+                                @RequestParam(value = "queryDate") Date queryDate) {
+        startPage();
+        List<WxNursingLog> list = wxNursingLogService.fr200MoistureTestRecord(instrumentId, queryDate);
+        return getDataTable(list);
+    }
+
     /**
      * 根据护理记录Id查询护理记录
      */

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxNursingLogService.java

@@ -31,4 +31,6 @@ public interface IWxNursingLogService {
     WxNursingLog selectWxNursingLogById(Long id);
 
     WxNursingStatisticsRet fr200Statistics(Long nursingId);
+
+    List<WxNursingLog> fr200MoistureTestRecord(Long instrumentId, Date queryDate);
 }

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java

@@ -183,6 +183,47 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
         return wxNursingStatisticsRet;
     }
 
+    @Override
+    public List<WxNursingLog> fr200MoistureTestRecord(Long instrumentId, Date queryDate) {
+        WxNursingLog wxNursingLog = new WxNursingLog();
+        if (instrumentId != null) {
+            wxNursingLog.setInstrumentId(instrumentId);
+        }
+        if (queryDate != null) {
+            wxNursingLog.getParams().put("endTime", queryDate);
+        }
+        wxNursingLog.setUserId(1231L);
+        List<WxNursingLog> wxNursingLogList = wxNursingLogMapper.fr200MoistureTestRecord(wxNursingLog);
+        if (wxNursingLogList != null && wxNursingLogList.size() > 0) {
+            for (WxNursingLog nursingLog : wxNursingLogList) {
+                WxMode wxMode = wxModeMapper.selectWxModeById(nursingLog.getModeId());
+                if (wxMode != null) {
+                    nursingLog.setModeImage(wxMode.getModeBanner());
+                }
+                WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(nursingLog.getInstrumentId());
+                if (wxInstrument != null) {
+                    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;
+    }
+
     /**
      * 新增用户护理日志
      */