diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentMode.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentMode.java
new file mode 100644
index 0000000..087afaa
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentMode.java
@@ -0,0 +1,97 @@
+package com.flossom.common.core.domain.entity;
+
+import com.flossom.common.core.annotation.Excel;
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 仪器与模式的关联对象 wx_instrument_mode
+ *
+ * @author flossom
+ * @date 2024-01-17
+ */
+public class WxInstrumentMode extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 仪器id
+     */
+    @Excel(name = "仪器id")
+    private Long instrumentId;
+
+    /**
+     * 模式id
+     */
+    @Excel(name = "模式id")
+    private Long modeId;
+
+    /**
+     * 排序
+     */
+    private Integer modeSort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private Integer status;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setInstrumentId(Long instrumentId) {
+        this.instrumentId = instrumentId;
+    }
+
+    public Long getInstrumentId() {
+        return instrumentId;
+    }
+
+    public void setModeId(Long modeId) {
+        this.modeId = modeId;
+    }
+
+    public Long getModeId() {
+        return modeId;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public Integer getModeSort() {
+        return modeSort;
+    }
+
+    public void setModeSort(Integer modeSort) {
+        this.modeSort = modeSort;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("instrumentId", getInstrumentId())
+                .append("modeId", getModeId())
+                .append("status", getStatus())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .toString();
+    }
+}
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
index 009b2f6..4b0b708 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxInstrumentSaveReq.java
@@ -183,6 +183,12 @@ public class WxInstrumentSaveReq {
      */
     private List<WxInstrumentFileRelate> introduceList;
 
+    /**
+     * 关联模式
+     * @return
+     */
+    private List<Integer> modeIdsValue;
+
     public Long getId() {
         return id;
     }
@@ -422,4 +428,12 @@ public class WxInstrumentSaveReq {
     public void setBindingCredit(Integer bindingCredit) {
         this.bindingCredit = bindingCredit;
     }
+
+    public List<Integer> getModeIdsValue() {
+        return modeIdsValue;
+    }
+
+    public void setModeIdsValue(List<Integer> modeIdsValue) {
+        this.modeIdsValue = modeIdsValue;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentModeMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentModeMapper.java
new file mode 100644
index 0000000..5a828ac
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentModeMapper.java
@@ -0,0 +1,64 @@
+package com.flossom.common.core.mapper;
+
+import com.flossom.common.core.domain.entity.WxInstrumentMode;
+
+import java.util.List;
+
+/**
+ * 仪器与模式的关联Mapper接口
+ *
+ * @author flossom
+ * @date 2024-01-17
+ */
+public interface WxInstrumentModeMapper {
+    /**
+     * 查询仪器与模式的关联
+     *
+     * @param id 仪器与模式的关联主键
+     * @return 仪器与模式的关联
+     */
+    public WxInstrumentMode selectWxInstrumentModeById(Long id);
+
+    /**
+     * 查询仪器与模式的关联列表
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 仪器与模式的关联集合
+     */
+    public List<WxInstrumentMode> selectWxInstrumentModeList(WxInstrumentMode wxInstrumentMode);
+
+    /**
+     * 新增仪器与模式的关联
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 结果
+     */
+    public int insertWxInstrumentMode(WxInstrumentMode wxInstrumentMode);
+
+    /**
+     * 修改仪器与模式的关联
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 结果
+     */
+    public int updateWxInstrumentMode(WxInstrumentMode wxInstrumentMode);
+
+    /**
+     * 删除仪器与模式的关联
+     *
+     * @param id 仪器与模式的关联主键
+     * @return 结果
+     */
+    public int deleteWxInstrumentModeById(Long id);
+
+    /**
+     * 批量删除仪器与模式的关联
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWxInstrumentModeByIds(Long[] ids);
+
+    public int deleteByInstrumentId(Long instrumentId);
+
+}
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
index 0c6403d..7c493dc 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
@@ -162,7 +162,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="miniTagNames != null">#{miniTagNames},</if>
             <if test="wecomTagIds != null">#{wecomTagIds},</if>
             <if test="wecomTagNames != null">#{wecomTagNames},</if>
-            <if test="sceneNames != null">#{sceneNames},</if>
             <if test="nursingTime != null">#{nursingTime},</if>
             <if test="iotVersion != null">#{iotVersion},</if>
             <if test="iotUpgradeData != null">#{iotUpgradeData},</if>
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml
new file mode 100644
index 0000000..2ba2e2d
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentModeMapper.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.flossom.common.core.mapper.WxInstrumentModeMapper">
+    
+    <resultMap type="WxInstrumentMode" id="WxInstrumentModeResult">
+        <result property="id"    column="id"    />
+        <result property="instrumentId"    column="instrument_id"    />
+        <result property="modeId"    column="mode_id"    />
+        <result property="modeSort"    column="mode_sort"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectWxInstrumentModeVo">
+        select id, instrument_id, mode_id, mode_sort, status, create_by, create_time from wx_instrument_mode
+    </sql>
+
+    <select id="selectWxInstrumentModeList" parameterType="WxInstrumentMode" resultMap="WxInstrumentModeResult">
+        <include refid="selectWxInstrumentModeVo"/>
+        <where>  
+            <if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
+            <if test="modeId != null "> and mode_id = #{modeId}</if>
+            <if test="status != null "> and status = #{status}</if>
+        </where>
+        order by mode_sort
+    </select>
+    
+    <select id="selectWxInstrumentModeById" parameterType="Long" resultMap="WxInstrumentModeResult">
+        <include refid="selectWxInstrumentModeVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertWxInstrumentMode" parameterType="WxInstrumentMode" useGeneratedKeys="true" keyProperty="id">
+        insert into wx_instrument_mode
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="instrumentId != null">instrument_id,</if>
+            <if test="modeId != null">mode_id,</if>
+            <if test="modeSort != null">mode_sort,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="instrumentId != null">#{instrumentId},</if>
+            <if test="modeId != null">#{modeId},</if>
+            <if test="modeSort != null">#{modeSort},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWxInstrumentMode" parameterType="WxInstrumentMode">
+        update wx_instrument_mode
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
+            <if test="modeId != null">mode_id = #{modeId},</if>
+            <if test="modeSort != null">mode_sort = #{modeSort},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteWxInstrumentModeById" parameterType="Long">
+        delete from wx_instrument_mode where id = #{id}
+    </delete>
+
+    <delete id="deleteWxInstrumentModeByIds" parameterType="String">
+        delete from wx_instrument_mode where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteByInstrumentId" parameterType="Long">
+        delete from wx_instrument_mode where instrument_id = #{instrumentId}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeController.java
index 111cb36..9e40436 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeController.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeController.java
@@ -4,6 +4,7 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.R;
 import com.flossom.common.core.domain.entity.WxMode;
 import com.flossom.common.core.utils.poi.ExcelUtil;
 import com.flossom.common.core.web.controller.BaseController;
@@ -48,6 +49,16 @@ public class WxModeController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询模式列列表
+     */
+    @RequiresPermissions("system:mode:list")
+    @GetMapping("/listAll")
+    public R listAll(WxMode wxMode)
+    {
+        return R.ok(wxModeService.selectWxModeList(wxMode));
+    }
+
     /**
      * 导出模式列列表
      */
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentModeService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentModeService.java
new file mode 100644
index 0000000..26cd906
--- /dev/null
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentModeService.java
@@ -0,0 +1,62 @@
+package com.flossom.system.service;
+
+import com.flossom.common.core.domain.entity.WxInstrumentMode;
+
+import java.util.List;
+
+
+/**
+ * 仪器与模式的关联Service接口
+ *
+ * @author flossom
+ * @date 2024-01-17
+ */
+public interface IWxInstrumentModeService {
+    /**
+     * 查询仪器与模式的关联
+     *
+     * @param id 仪器与模式的关联主键
+     * @return 仪器与模式的关联
+     */
+    public WxInstrumentMode selectWxInstrumentModeById(Long id);
+
+    /**
+     * 查询仪器与模式的关联列表
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 仪器与模式的关联集合
+     */
+    public List<WxInstrumentMode> selectWxInstrumentModeList(WxInstrumentMode wxInstrumentMode);
+
+    /**
+     * 新增仪器与模式的关联
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 结果
+     */
+    public int insertWxInstrumentMode(WxInstrumentMode wxInstrumentMode);
+
+    /**
+     * 修改仪器与模式的关联
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 结果
+     */
+    public int updateWxInstrumentMode(WxInstrumentMode wxInstrumentMode);
+
+    /**
+     * 批量删除仪器与模式的关联
+     *
+     * @param ids 需要删除的仪器与模式的关联主键集合
+     * @return 结果
+     */
+    public int deleteWxInstrumentModeByIds(Long[] ids);
+
+    /**
+     * 删除仪器与模式的关联信息
+     *
+     * @param id 仪器与模式的关联主键
+     * @return 结果
+     */
+    public int deleteWxInstrumentModeById(Long id);
+}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentModeServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentModeServiceImpl.java
new file mode 100644
index 0000000..ca61448
--- /dev/null
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentModeServiceImpl.java
@@ -0,0 +1,90 @@
+package com.flossom.system.service.impl;
+
+import java.util.List;
+
+import com.flossom.common.core.domain.entity.WxInstrumentMode;
+import com.flossom.common.core.mapper.WxInstrumentModeMapper;
+import com.flossom.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.flossom.system.service.IWxInstrumentModeService;
+
+/**
+ * 仪器与模式的关联Service业务层处理
+ *
+ * @author flossom
+ * @date 2024-01-17
+ */
+@Service
+public class WxInstrumentModeServiceImpl implements IWxInstrumentModeService {
+
+    @Autowired
+    private WxInstrumentModeMapper wxInstrumentModeMapper;
+
+    /**
+     * 查询仪器与模式的关联
+     *
+     * @param id 仪器与模式的关联主键
+     * @return 仪器与模式的关联
+     */
+    @Override
+    public WxInstrumentMode selectWxInstrumentModeById(Long id) {
+        return wxInstrumentModeMapper.selectWxInstrumentModeById(id);
+    }
+
+    /**
+     * 查询仪器与模式的关联列表
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 仪器与模式的关联
+     */
+    @Override
+    public List<WxInstrumentMode> selectWxInstrumentModeList(WxInstrumentMode wxInstrumentMode) {
+        return wxInstrumentModeMapper.selectWxInstrumentModeList(wxInstrumentMode);
+    }
+
+    /**
+     * 新增仪器与模式的关联
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 结果
+     */
+    @Override
+    public int insertWxInstrumentMode(WxInstrumentMode wxInstrumentMode) {
+        wxInstrumentMode.setCreateTime(DateUtils.getNowDate());
+        return wxInstrumentModeMapper.insertWxInstrumentMode(wxInstrumentMode);
+    }
+
+    /**
+     * 修改仪器与模式的关联
+     *
+     * @param wxInstrumentMode 仪器与模式的关联
+     * @return 结果
+     */
+    @Override
+    public int updateWxInstrumentMode(WxInstrumentMode wxInstrumentMode) {
+        return wxInstrumentModeMapper.updateWxInstrumentMode(wxInstrumentMode);
+    }
+
+    /**
+     * 批量删除仪器与模式的关联
+     *
+     * @param ids 需要删除的仪器与模式的关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWxInstrumentModeByIds(Long[] ids) {
+        return wxInstrumentModeMapper.deleteWxInstrumentModeByIds(ids);
+    }
+
+    /**
+     * 删除仪器与模式的关联信息
+     *
+     * @param id 仪器与模式的关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWxInstrumentModeById(Long id) {
+        return wxInstrumentModeMapper.deleteWxInstrumentModeById(id);
+    }
+}
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
index e15ba5b..ffcf61b 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java
@@ -3,16 +3,20 @@ package com.flossom.system.service.impl;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.flossom.common.core.domain.entity.SysTag;
 import com.flossom.common.core.domain.entity.WxInstrument;
 import com.flossom.common.core.domain.entity.WxInstrumentFileRelate;
+import com.flossom.common.core.domain.entity.WxInstrumentMode;
 import com.flossom.common.core.domain.req.WxInstrumentReq;
 import com.flossom.common.core.domain.req.WxInstrumentSaveReq;
 import com.flossom.common.core.enums.InstrumentFileClassify;
+import com.flossom.common.core.enums.Status;
 import com.flossom.common.core.mapper.SysTagMapper;
 import com.flossom.common.core.mapper.WxInstrumentFileRelateMapper;
 import com.flossom.common.core.mapper.WxInstrumentMapper;
+import com.flossom.common.core.mapper.WxInstrumentModeMapper;
 import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.core.utils.StringUtils;
 import com.flossom.common.security.utils.SecurityUtils;
@@ -40,6 +44,9 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
     @Autowired
     private WxInstrumentFileRelateMapper wxInstrumentFileRelateMapper;
 
+    @Autowired
+    private WxInstrumentModeMapper wxInstrumentModeMapper;
+
     /**
      * 查询仪器列
      *
@@ -74,6 +81,16 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         List<WxInstrumentFileRelate> instructionRelate = wxInstrumentFileRelateMapper.
                 selectByInstrumentIdAndClassify(wxInstrument.getId(), InstrumentFileClassify.INSTRUMENT_INSTRUCTION.getCode());
         wxInstrumentSaveReq.setIntroduceList(instructionRelate);
+        // 获取模式关联
+        WxInstrumentMode wxInstrumentMode = new WxInstrumentMode();
+        wxInstrumentMode.setInstrumentId(id);
+        List<WxInstrumentMode> wxInstrumentModes = wxInstrumentModeMapper.selectWxInstrumentModeList(wxInstrumentMode);
+        if (wxInstrumentModes != null && wxInstrumentModes.size() > 0) {
+            wxInstrumentSaveReq.setModeIdsValue(wxInstrumentModes.stream()
+                    .map(WxInstrumentMode::getModeId)
+                    .map(Long::intValue)
+                    .collect(Collectors.toList()));
+        }
         return wxInstrumentSaveReq;
     }
 
@@ -116,12 +133,14 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         WxInstrument wxInstrument = new WxInstrument();
         BeanUtils.copyProperties(wxInstrumentSaveReq, wxInstrument);
         // 打卡时间处理
-        wxInstrument.setStartTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(0));
-        wxInstrument.setEndTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(1));
+        if (wxInstrumentSaveReq.getIsExtraClock() != null && wxInstrumentSaveReq.getIsExtraClock() == 1) {
+            wxInstrument.setStartTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(0));
+            wxInstrument.setEndTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(1));
+        }
         wxInstrument.setCreateBy(SecurityUtils.getUsername());
         wxInstrument.setCreateTime(DateUtils.getNowDate());
 
-        int i = wxInstrumentMapper.insertWxInstrument(wxInstrument);
+        int insertNum = wxInstrumentMapper.insertWxInstrument(wxInstrument);
 
         // 保存初次护理规则
         List<WxInstrumentFileRelate> nurseList = wxInstrumentSaveReq.getNurseList();
@@ -154,7 +173,23 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
                 wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
             }
         }
-        return i;
+
+        // 模式关联
+        List<Integer> modeIdList = wxInstrumentSaveReq.getModeIdsValue();
+        if (modeIdList != null && modeIdList.size() > 0) {
+            wxInstrumentModeMapper.deleteByInstrumentId(wxInstrumentSaveReq.getId());
+            for (int i = 0; i < modeIdList.size(); i++) {
+                WxInstrumentMode wxInstrumentMode = new WxInstrumentMode();
+                wxInstrumentMode.setInstrumentId(wxInstrument.getId());
+                wxInstrumentMode.setModeId(modeIdList.get(i).longValue());
+                wxInstrumentMode.setModeSort(i);
+                wxInstrumentMode.setStatus(Status.OK.getCode());
+                wxInstrumentMode.setCreateBy(SecurityUtils.getUsername());
+                wxInstrumentMode.setCreateTime(DateUtils.getNowDate());
+                wxInstrumentModeMapper.insertWxInstrumentMode(wxInstrumentMode);
+            }
+        }
+        return insertNum;
     }
 
     /**
@@ -201,8 +236,11 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
         wxInstrument.setUpdateTime(DateUtils.getNowDate());
 
         // 打卡时间处理
-        wxInstrument.setStartTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(0));
-        wxInstrument.setEndTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(1));
+        // 打卡时间处理
+        if (wxInstrumentSaveReq.getIsExtraClock() != null && wxInstrumentSaveReq.getIsExtraClock() == 1) {
+            wxInstrument.setStartTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(0));
+            wxInstrument.setEndTime(wxInstrumentSaveReq.getExtraClockTimeRange().get(1));
+        }
 
         // 保存初次护理规则
         List<WxInstrumentFileRelate> nurseList = wxInstrumentSaveReq.getNurseList();
@@ -238,6 +276,21 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             wxInstrumentFileRelateMapper.insertWxInstrumentFileRelate(next);
         }
 
+        // 模式关联
+        List<Integer> modeIdList = wxInstrumentSaveReq.getModeIdsValue();
+        if (modeIdList != null && modeIdList.size() > 0) {
+            wxInstrumentModeMapper.deleteByInstrumentId(wxInstrumentSaveReq.getId());
+            for (int i = 0; i < modeIdList.size(); i++) {
+                WxInstrumentMode wxInstrumentMode = new WxInstrumentMode();
+                wxInstrumentMode.setInstrumentId(wxInstrumentSaveReq.getId());
+                wxInstrumentMode.setModeId(modeIdList.get(i).longValue());
+                wxInstrumentMode.setModeSort(i);
+                wxInstrumentMode.setStatus(Status.OK.getCode());
+                wxInstrumentMode.setCreateBy(SecurityUtils.getUsername());
+                wxInstrumentMode.setCreateTime(DateUtils.getNowDate());
+                wxInstrumentModeMapper.insertWxInstrumentMode(wxInstrumentMode);
+            }
+        }
         return wxInstrumentMapper.updateWxInstrument(wxInstrument);
     }
 
diff --git a/flossom-ui/src/api/system/instrument.js b/flossom-ui/src/api/system/instrument.js
index 1a02129..e070ed7 100644
--- a/flossom-ui/src/api/system/instrument.js
+++ b/flossom-ui/src/api/system/instrument.js
@@ -135,6 +135,13 @@ export function delInstructions(id) {
   })
 }
 
+export function listAllMode(query) {
+  return request({
+    url: '/system/mode/listAll',
+    method: 'get',
+    params: query
+  })
+}
 
 
 
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index 0566b72..5fca60f 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -447,7 +447,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="仪器绑定积分" prop="bindingCredit">
-          <el-input-number :min="0" :precision="0" v-model="form.bindingCredit" />
+          <el-input-number :min="0" :precision="0" v-model="form.bindingCredit"/>
         </el-form-item>
         <el-form-item label="仪器类型" prop="type">
           <el-select
@@ -468,20 +468,20 @@
             <el-option label="M01" value="M01"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="模式ID" prop="sceneIds">
-          <!-- <el-input v-model="form.sceneIds" placeholder="请输入模式ID"/> -->
-          <el-select v-model="sceneIdsValue" multiple placeholder="请选择模式ID">
-            <el-option
-              v-for="item in sceneIdsOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-          <span v-if="sceneIdsValue.length > 1" style="cursor: pointer;color:#1890ff;margin-left:10px" @click="openSceneDialog()">排序</span>
-        </el-form-item>
-        <el-form-item label="模式名称" prop="sceneNames">
-          <el-input v-model="form.sceneNames" placeholder="请输入模式名称"/>
+        <el-form-item label="模式" prop="modeIds">
+          <template>
+            <el-select v-model="form.modeIdsValue" multiple placeholder="请选择模式">
+              <el-option
+                v-for="item in this.mode.modeIdsOptions"
+                :key="item.id"
+                :label="item.modeName"
+                :value="item.id">
+              </el-option>
+            </el-select>
+            <el-button v-if="form.modeIdsValue!=undefined && form.modeIdsValue!=null && form.modeIdsValue.length > 1"
+                       @click="openModeIdDialog()" size="small" type="primary">排序
+            </el-button>
+          </template>
         </el-form-item>
         <el-form-item label="生成护理记录最短时间" prop="nursingTime">
           <el-time-picker
@@ -874,22 +874,18 @@
       </el-table>
     </el-dialog>
 
-    <el-dialog
-      title="排序"
-      :visible.sync="isSceneIdsVisible"
-      width="50%"
-      :close-on-click-modal="false"
-      :before-close="handleCloseScene">
+    <el-dialog title="排序" :visible.sync="mode.modeSortVisible" width="50%" :close-on-click-modal="false"
+               :before-close="handleCloseMode">
       <div>
-        <draggable v-model="sceneIdsValue" draggable=".itemTag">
-          <template v-for="element in sceneIdsValue">
-            <el-tag  :key="element" class="itemTag"> {{element}}</el-tag>
+        <draggable v-model="mode.modeIdsValueTemp" draggable=".itemTag">
+          <template v-for="element in this.mode.modeIdsValueTemp">
+            <el-tag :key="element.id" class="itemTag"> {{ element.modeName }}</el-tag>
           </template>
         </draggable>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="isSceneIdsVisible = false">取 消</el-button>
-        <el-button type="primary" @click="isSceneIdsVisible = false">确 定</el-button>
+        <el-button @click="handleCloseMode">取 消</el-button>
+        <el-button type="primary" @click="handleSaveMode">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -911,7 +907,7 @@ import {
   listInstructions,
   delInstructions,
   addInstructions,
-  updateInstructions,
+  updateInstructions, listAllMode,
 } from '@/api/system/instrument'
 import {getToken} from '@/utils/auth'
 import Treeselect from '@riophae/vue-treeselect'
@@ -923,7 +919,7 @@ import draggable from 'vuedraggable'
 
 export default {
   name: 'Instrument',
-  components: {Treeselect,draggable},
+  components: {Treeselect, draggable},
   data() {
     return {
       // 遮罩层
@@ -1127,23 +1123,13 @@ export default {
         }
         ]
       },
-
-
-      isSceneIdsVisible: false,
-      sceneIdsValue: [], // value
-      sceneIdsValueTemp: [],
-      sceneIdsOptions: [
-        {
-          value: '黄金糕',
-          label: '黄金糕'
-        }, {
-          value: '双皮奶',
-          label: '双皮奶'
-        }, {
-          value: '蚵仔煎',
-          label: '蚵仔煎'
-        }
-      ]
+      /* 模式 */
+      mode: {
+        modeSortVisible: false,
+        modeIdsValueTemp: [],
+        modeIdsOptions: [],
+        sortMode: [],
+      },
     }
   },
   created() {
@@ -1219,6 +1205,7 @@ export default {
         scanCodeBinding: null,
         nurseList: null,
         introduceList: null,
+        modeIdsValue: [],
       }
       /* 仪器封面 */
       this.bannerFile = {
@@ -1269,7 +1256,13 @@ export default {
         uploadHide: false,
         fileList: [],
       }
-      // this.form.iotVersionUpgrade = null,
+      /* 模式 */
+      this.mode = {
+        modeSortVisible: false,
+        modeIdsValueTemp: [],
+        modeIdsOptions: [],
+        sortMode: [],
+      };
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -1300,6 +1293,14 @@ export default {
       this.reset()
       this.open = true
       this.title = '添加仪器列'
+      /* 所有模式选项 */
+      this.mode.modeIdsOptions = [];
+      listAllMode().then((response) => {
+        if (response.code != 200) {
+          this.$message.error('模式获取失败')
+        }
+        this.mode.modeIdsOptions = response.data
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -1384,6 +1385,15 @@ export default {
           this.introduceIndex = response.data.introduceList.length;
           this.introduceList = response.data.introduceList;
         }
+
+        /* 所有模式选项 */
+        this.mode.modeIdsOptions = [];
+        listAllMode().then((response) => {
+          if (response.code != 200) {
+            this.$message.error('模式获取失败')
+          }
+          this.mode.modeIdsOptions = response.data
+        })
       })
     },
     /** 提交按钮 */
@@ -1837,17 +1847,33 @@ export default {
     viewInstrumentInstruction(item) {
       window.open(item.link, '_blank');
     },
-
-    openSceneDialog() {
-      this.sceneIdsValueTemp = JSON.parse(JSON.stringify(this.sceneIdsValue))
-      this.isSceneIdsVisible = true;
+    /* 模式 */
+    openModeIdDialog() {
+      this.mode.modeIdsValueTemp = [];
+      this.mode.sortMode = [];
+      if (this.form.modeIdsValue.length > 1) {
+        for (let i = 0; i < this.form.modeIdsValue.length; i++) {
+          let filterModeArr = this.mode.modeIdsOptions.filter((item) => item.id == this.form.modeIdsValue[i])
+          this.mode.modeIdsValueTemp.push(filterModeArr[0]);
+        }
+        this.mode.modeSortVisible = true;
+      }
     },
-    handleCloseScene() {
-      this.isSceneIdsVisible = false;
+    openModeIdDialog2() {
+      console.log(this.form.modeIdsValue);
     },
-    handleSaveScene() {
-      this.sceneIdsValue = JSON.parse(JSON.stringify(this.sceneIdsValueTemp))
-      this.handleCloseScene()
+    handleCloseMode() {
+      this.mode.modeIdsValueTemp = [];
+      this.mode.sortMode = [];
+      this.mode.modeSortVisible = false;
+    },
+    handleSaveMode() {
+      let newSort = [];
+      for (let i = 0; i < this.mode.modeIdsValueTemp.length; i++) {
+        newSort.push(this.mode.modeIdsValueTemp[i].id)
+      }
+      this.form.modeIdsValue = newSort;
+      this.handleCloseMode()
     },
   },
 }