From 36efd718c560deead710303a92bcecf7c3a09caa Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Mon, 5 Feb 2024 09:46:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=AA=E5=99=A8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/WxNursingLog.java     | 13 +++++++++++++
 .../service/impl/WxNursingLogServiceImpl.java       |  5 +++++
 2 files changed, 18 insertions(+)

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 1d1a07b..f48aa85 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
@@ -33,6 +33,11 @@ public class WxNursingLog extends BaseEntity {
      */
     private String instrumentName;
 
+    /**
+     * 仪器：1、普通仪器 2、iot仪器
+     */
+    private Integer instrumentType;
+
     /**
      * 是否在线，1在线，2离线
      */
@@ -161,4 +166,12 @@ public class WxNursingLog extends BaseEntity {
     public void setModeImage(String modeImage) {
         this.modeImage = modeImage;
     }
+
+    public Integer getInstrumentType() {
+        return instrumentType;
+    }
+
+    public void setInstrumentType(Integer instrumentType) {
+        this.instrumentType = instrumentType;
+    }
 }
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 f851140..4915e95 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
@@ -92,6 +92,11 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService {
                 if (wxMode != null) {
                     nursingLog.setModeImage(wxMode.getModeBanner());
                 }
+                WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(nursingLog.getInstrumentId());
+                if (wxInstrument != null) {
+                    nursingLog.setInstrumentType(wxInstrument.getType());
+                    nursingLog.setInstrumentName(wxInstrument.getName());
+                }
             }
         }
         return wxNursingLogList;