From 1a02a6954e9dda6d0fbc4820f6b57c32ef4adf7d Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Fri, 22 Mar 2024 14:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E6=8A=A5=E5=91=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxNursingLogServiceImpl.java | 54 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

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 3c0c3b5..2d5bd34 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
@@ -90,6 +90,7 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
             wxNursingLog.setInstrumentId(instrumentId);
         }
         if (queryDate != null) {
+            // 不包含当天
             wxNursingLog.getParams().put("endTime", queryDate);
         }
         wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
@@ -190,7 +191,9 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
             wxNursingLog.setInstrumentId(instrumentId);
         }
         if (queryDate != null) {
-            wxNursingLog.getParams().put("endTime", queryDate);
+            // 包含当天
+            LocalDateTime endDate = LocalDateTime.ofInstant(queryDate.toInstant(), ZoneId.systemDefault()).plusDays(1);
+            wxNursingLog.getParams().put("endTime", endDate);
         }
         wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
         List<WxNursingLog> wxNursingLogList = wxNursingLogMapper.fr200MoistureTestRecord(wxNursingLog);
@@ -224,6 +227,55 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
         return wxNursingLogList;
     }
 
+    @Override
+    public List<WxNursingLog> fr200RecordOther(Long nursingLogId) {
+        /*WxNursingLog nursingLog = wxNursingLogMapper.selectWxNursingLogById(nursingLogId);
+        Long userId = nursingLog.getUserId();
+        Long modeId = nursingLog.getModeId();*/
+
+
+
+        /*// 排序：最新的护理记录在最上方；图片由后台模式管理-模式封面图片进行配置；
+        WxNursingLog wxNursingLog = new WxNursingLog();
+        if (instrumentId != null) {
+            wxNursingLog.setInstrumentId(instrumentId);
+        }
+        if (queryDate != null) {
+            wxNursingLog.getParams().put("endTime", queryDate);
+        }
+        wxNursingLog.setUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());*/
+        /*List<WxNursingLog> wxNursingLogList = wxNursingLogMapper.selectWxNursingLogList(null);
+        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;*/
+        return null;
+    }
+
     /**
      * 新增用户护理日志
      */