diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
index dff3b3f..7ac46b0 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
@@ -382,4 +382,27 @@ public class GyzjController extends BaseController
         gyzjService.jy(form);
         return AjaxResult.success("操作成功");
     }
+
+    /**
+     * 存储
+     */
+    @PostMapping("cc")
+    @RequiresPermissions({"business:studyGyzj:cc","business:nonTrialGyzj:cc","business:drugGyzj:cc"})
+    public AjaxResult cc(@RequestBody CcForm form)
+    {
+        gyzjService.cc(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 取出
+     */
+    @PostMapping("qc")
+    @RequiresPermissions({"business:studyGyzj:qc","business:nonTrialGyzj:qc","business:drugGyzj:qc"})
+    public AjaxResult qc(@RequestBody CcForm form)
+    {
+        gyzjService.qc(form);
+        return AjaxResult.success("操作成功");
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java
index dc24bc4..925526e 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java
@@ -319,7 +319,7 @@ public class MjyController extends BaseController {
      * 归还
      */
     @PostMapping("gh")
-    @RequiresPermissions({"business:resource:mjy:gh", "business:studyMjy:gh", "business:nonTrialMjy:gh", "business:drugMjy:gh"})
+    @RequiresPermissions({"business:resource:mjy:gh"})
     public AjaxResult gh(@RequestBody GhForm form) {
         form.setQmrId(SecurityUtils.getUserId());
         mjyService.gh(form);
@@ -346,4 +346,26 @@ public class MjyController extends BaseController {
         mjyService.jy(form);
         return AjaxResult.success("操作成功");
     }
+
+    /**
+     * 存储
+     */
+    @PostMapping("cc")
+    @RequiresPermissions({"business:studyMjy:cc","business:nonTrialMjy:cc","business:drugMjy:cc"})
+    public AjaxResult cc(@RequestBody CcForm form)
+    {
+        mjyService.cc(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 取出
+     */
+    @PostMapping("qc")
+    @RequiresPermissions({"business:studyMjy:qc","business:nonTrialMjy:qc","business:drugMjy:qc"})
+    public AjaxResult qc(@RequestBody CcForm form)
+    {
+        mjyService.qc(form);
+        return AjaxResult.success("操作成功");
+    }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java
index 538089f..6f6dfa3 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java
@@ -73,6 +73,9 @@ public class Gyzj extends MpBaseEntity
     /** 入库申请状态：1：未申请；3：申请入库*/
     private Integer rksqzt;
 
+    /** 存储状态：1：取出；3：存储*/
+    private Integer cczt;
+
 
     /** 关联暂存柜id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -246,6 +249,14 @@ public class Gyzj extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String qmr2McEn;
 
+    public Integer getCczt() {
+        return cczt;
+    }
+
+    public void setCczt(Integer cczt) {
+        this.cczt = cczt;
+    }
+
     public String getRkbz() {
         return rkbz;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java
index 9e3f044..3bb2061 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java
@@ -68,6 +68,10 @@ public class Mjy extends MpBaseEntity
     /** 归还状态：1：未申请；3：申请归还 */
     private Integer ghzt;
 
+    /** 存储状态：1：取出；3：存储*/
+    private Integer cczt;
+
+
     /** 关联暂存柜id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long zcgId;
@@ -213,6 +217,14 @@ public class Mjy extends MpBaseEntity
     /** 发放目的其他 */
     private String mdOther;
 
+    public Integer getCczt() {
+        return cczt;
+    }
+
+    public void setCczt(Integer cczt) {
+        this.cczt = cczt;
+    }
+
     public String getBjrMcEn() {
         return bjrMcEn;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java
index 0ab8b31..8cdcab0 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java
@@ -21,17 +21,6 @@ public class StudyGyzj extends MpBaseEntity
     /** 资源id */
     private Long resourceId;
 
-    /** 试验归还状态：1：未归还；10：已归还*/
-    private Integer syghzt;
-
-    public Integer getSyghzt() {
-        return syghzt;
-    }
-
-    public void setSyghzt(Integer syghzt) {
-        this.syghzt = syghzt;
-    }
-
     public void setStudyId(Long studyId)
     {
         this.studyId = studyId;
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java
index 17a93a1..8c6b82c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java
@@ -21,16 +21,6 @@ public class StudyMjy extends MpBaseEntity
     /** 资源id */
     private Long resourceId;
 
-    /** 试验归还状态：1：未归还；10：已归还*/
-    private Integer syghzt;
-
-    public Integer getSyghzt() {
-        return syghzt;
-    }
-
-    public void setSyghzt(Integer syghzt) {
-        this.syghzt = syghzt;
-    }
 
     public void setStudyId(Long studyId)
     {
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/CcztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/CcztEnum.java
new file mode 100644
index 0000000..bf2aaee
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/CcztEnum.java
@@ -0,0 +1,51 @@
+package com.hxhq.business.enums.zykgl;
+
+/**
+ * 存储状态：1：取出；3：存储
+ * @author tanfei
+ */
+public enum CcztEnum {
+
+    /**
+     * 取出
+     */
+    Qc(1, "取出"),
+
+    /**
+     * 存储
+     */
+    Cc(3, "存储");
+
+    private int value;
+    private String text;
+
+    CcztEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public static CcztEnum getEnumByValue(int type) {
+        for (CcztEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CcForm.java
new file mode 100644
index 0000000..8d2fcd6
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/CcForm.java
@@ -0,0 +1,96 @@
+package com.hxhq.business.form.gyzj;
+
+/**
+ * @author 15881
+ */
+public class CcForm {
+
+    /** 给药制剂id */
+    private Long id;
+
+    /** 存储条件 */
+    private String cctj;
+
+    /** 存储位置 */
+    private String ccwz;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人1id */
+    private Long qmr1Id;
+
+    /** 签名人1密码 */
+    private String qmr1mm;
+
+    /** 签名人2id */
+    private Long qmr2Id;
+
+    /** 签名人2密码 */
+    private String qmr2mm;
+
+    public Long getQmr1Id() {
+        return qmr1Id;
+    }
+
+    public void setQmr1Id(Long qmr1Id) {
+        this.qmr1Id = qmr1Id;
+    }
+
+    public String getQmr1mm() {
+        return qmr1mm;
+    }
+
+    public void setQmr1mm(String qmr1mm) {
+        this.qmr1mm = qmr1mm;
+    }
+
+    public Long getQmr2Id() {
+        return qmr2Id;
+    }
+
+    public void setQmr2Id(Long qmr2Id) {
+        this.qmr2Id = qmr2Id;
+    }
+
+    public String getQmr2mm() {
+        return qmr2mm;
+    }
+
+    public void setQmr2mm(String qmr2mm) {
+        this.qmr2mm = qmr2mm;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCctj() {
+        return cctj;
+    }
+
+    public void setCctj(String cctj) {
+        this.cctj = cctj;
+    }
+
+    public String getCcwz() {
+        return ccwz;
+    }
+
+    public void setCcwz(String ccwz) {
+        this.ccwz = ccwz;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+}
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CcForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CcForm.java
new file mode 100644
index 0000000..622c473
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/CcForm.java
@@ -0,0 +1,96 @@
+package com.hxhq.business.form.mjy;
+
+/**
+ * @author 15881
+ */
+public class CcForm {
+
+    /** 麻精药id */
+    private Long id;
+
+    /** 存储条件 */
+    private String cctj;
+
+    /** 存储位置 */
+    private String ccwz;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人1id */
+    private Long qmr1Id;
+
+    /** 签名人1密码 */
+    private String qmr1mm;
+
+    /** 签名人2id */
+    private Long qmr2Id;
+
+    /** 签名人2密码 */
+    private String qmr2mm;
+
+    public Long getQmr1Id() {
+        return qmr1Id;
+    }
+
+    public void setQmr1Id(Long qmr1Id) {
+        this.qmr1Id = qmr1Id;
+    }
+
+    public String getQmr1mm() {
+        return qmr1mm;
+    }
+
+    public void setQmr1mm(String qmr1mm) {
+        this.qmr1mm = qmr1mm;
+    }
+
+    public Long getQmr2Id() {
+        return qmr2Id;
+    }
+
+    public void setQmr2Id(Long qmr2Id) {
+        this.qmr2Id = qmr2Id;
+    }
+
+    public String getQmr2mm() {
+        return qmr2mm;
+    }
+
+    public void setQmr2mm(String qmr2mm) {
+        this.qmr2mm = qmr2mm;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCctj() {
+        return cctj;
+    }
+
+    public void setCctj(String cctj) {
+        this.cctj = cctj;
+    }
+
+    public String getCcwz() {
+        return ccwz;
+    }
+
+    public void setCcwz(String ccwz) {
+        this.ccwz = ccwz;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+}
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
index c29bce2..f736d03 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
@@ -8,6 +8,9 @@ import com.hxhq.business.dto.gyzj.DetailDto;
 import com.hxhq.business.dto.gyzj.ListDto;
 import com.hxhq.business.form.gyzj.*;
 ;
+import com.hxhq.common.core.web.domain.AjaxResult;
+import com.hxhq.common.security.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
@@ -16,8 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author hxhq
  * @date 2025-12-18
  */
-public interface IGyzjService extends IService<Gyzj>
-{
+public interface IGyzjService extends IService<Gyzj> {
     /**
      * 查询给药制剂列表
      *
@@ -47,21 +49,21 @@ public interface IGyzjService extends IService<Gyzj>
      *
      * @param form
      */
-    public void  jd(@RequestBody JdForm form);
+    public void jd(JdForm form);
 
     /**
      * 批量归档
      *
      * @param form
      */
-    public void plgd(@RequestBody GdForm form);
+    public void plgd(GdForm form);
 
     /**
      * 归档
      *
      * @param form
      */
-    public void gd(@RequestBody GdForm form);
+    public void gd(GdForm form);
 
 
     /**
@@ -69,49 +71,49 @@ public interface IGyzjService extends IService<Gyzj>
      *
      * @param form
      */
-    public void plsd(@RequestBody SdForm form);
+    public void plsd(SdForm form);
 
     /**
      * 锁定
      *
      * @param form
      */
-    public void sd(@RequestBody SdForm form);
+    public void sd(SdForm form);
 
     /**
      * 解锁
      *
      * @param form
      */
-    public void js(@RequestBody JsForm form);
+    public void js(JsForm form);
 
     /**
      * 批量处置药剂
      *
      * @param form
      */
-    public void plczyj(@RequestBody PlczyjForm form);
+    public void plczyj(PlczyjForm form);
 
     /**
      * 处置药剂
      *
      * @param form
      */
-    public void czyj(@RequestBody CzyjForm form);
+    public void czyj(CzyjForm form);
 
     /**
      * 批量处置容器
      *
      * @param form
      */
-    public void plczrq(@RequestBody PlczrqForm form);
+    public void plczrq(PlczrqForm form);
 
     /**
      * 处置容器
      *
      * @param form
      */
-    public void czrq(@RequestBody CzrqForm form);
+    public void czrq(CzrqForm form);
 
 
     /**
@@ -119,7 +121,7 @@ public interface IGyzjService extends IService<Gyzj>
      *
      * @param form
      */
-    public void ysff(@RequestBody YsffForm form);
+    public void ysff(YsffForm form);
 
 
     /**
@@ -127,7 +129,7 @@ public interface IGyzjService extends IService<Gyzj>
      *
      * @param form
      */
-    public void ff(@RequestBody FfForm form);
+    public void ff(FfForm form);
 
 
     /**
@@ -135,35 +137,35 @@ public interface IGyzjService extends IService<Gyzj>
      *
      * @param form
      */
-    public void plff(@RequestBody PlffForm form);
+    public void plff(PlffForm form);
 
     /**
      * 编辑
      *
      * @param form
      */
-    public void bj(@RequestBody BjForm form);
+    public void bj(BjForm form);
 
     /**
      * 审核编辑
      *
      * @param form
      */
-    public void shbj(@RequestBody ShbjForm form);
+    public void shbj(ShbjForm form);
 
     /**
      * 修改库存
      *
      * @param form
      */
-    public void xgkc(@RequestBody XgkcForm form);
+    public void xgkc(XgkcForm form);
 
     /**
      * 审核修改库存
      *
      * @param form
      */
-    public void shxgkc(@RequestBody ShxgkcForm form);
+    public void shxgkc(ShxgkcForm form);
 
 
     /**
@@ -171,21 +173,21 @@ public interface IGyzjService extends IService<Gyzj>
      *
      * @param form
      */
-    public void jy(@RequestBody JyForm form);
+    public void jy(JyForm form);
 
     /**
      * 申请归还
      *
      * @param form
      */
-    public void sqgh(@RequestBody GhForm form);
+    public void sqgh(GhForm form);
 
     /**
      * 确认归还
      *
      * @param form
      */
-    public void gh(@RequestBody GhForm form);
+    public void gh(GhForm form);
 
 
     /**
@@ -193,12 +195,22 @@ public interface IGyzjService extends IService<Gyzj>
      *
      * @param form
      */
-    public void sqrk(@RequestBody RkForm form);
+    public void sqrk(RkForm form);
 
     /**
      * 确认入库
      *
      * @param form
      */
-    public void rk(@RequestBody RkForm form);
+    public void rk(RkForm form);
+
+    /**
+     * 存储
+     */
+    public void cc(CcForm form) ;
+
+    /**
+     * 取出
+     */
+    public void qc(CcForm form) ;
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java
index 80ce9d1..dc74144 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java
@@ -185,4 +185,14 @@ public interface IMjyService extends IService<Mjy> {
      * @param form
      */
     public void rk(RkForm form);
+
+    /**
+     * 存储
+     */
+    public void cc(CcForm form) ;
+
+    /**
+     * 取出
+     */
+    public void qc(CcForm form) ;
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
index ddf0af2..872ba61 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java
@@ -2,6 +2,7 @@ package com.hxhq.business.service.impl;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -63,8 +64,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     /**
      * 列表
      *
-     * @param form 发放记录发放记录
-     * @return 发放记录发放记录
+     * @param form 发放记录
+     * @return 发放记录
      */
     @Override
     public List<FfjlListDto> queryList(FfjlSearchForm form) {
@@ -109,8 +110,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jq(FfjlJqForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -122,7 +124,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
             throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能加签");
         }
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null,qmr, form.getRemark());
     }
 
     /**
@@ -133,8 +135,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jy(FfjlJyForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -157,7 +160,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr, form.getRemark());
     }
 
     /**
@@ -182,23 +185,24 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jd(FfjlJdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
         GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
         if (gyzjFfjlOld == null) {
-            throw new ServiceException("发放记录发放记录不存在或已删除");
+            throw new ServiceException("发放记录不存在或已删除");
         }
         if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.gd.getValue())) {
-            throw new ServiceException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】未归档，不能解档");
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】未归档，不能解档");
         }
         //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作；
         gyzjFfjlOld.setJlzt(JlztEnum.djd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
     }
 
     /**
@@ -209,8 +213,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plgd(FfjlGdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -221,14 +226,14 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         if (gyzjFfjlList.size() > 0) {
             for (GyzjFfjl gyzj : gyzjFfjlList) {
                 if (!gyzj.getJlzt().equals(JlztEnum.ysd.getValue())) {
-                    throw new ServiceException("发放记录发放记录【" + gyzj.getMc() + "】不是锁定状态，不能归档");
+                    throw new ServiceException("发放记录【" + gyzj.getMc() + "】不是锁定状态，不能归档");
                 }
             }
             for (GyzjFfjl gyzjFfjl : gyzjFfjlList) {
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 gyzjFfjl.setJlzt(JlztEnum.dgd.getValue());
                 // 稽查轨迹
-                gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()));
+                gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
             }
             this.updateBatchById(gyzjFfjlList);
             gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList);
@@ -243,23 +248,24 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void gd(FfjlGdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
         GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
         if (gyzjFfjlOld == null) {
-            throw new ServiceException("发放记录发放记录不存在或已删除");
+            throw new ServiceException("发放记录不存在或已删除");
         }
         if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) {
-            throw new ServiceException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】不是锁定状态，不能归档");
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是锁定状态，不能归档");
         }
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         gyzjFfjlOld.setJlzt(JlztEnum.dgd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
     }
 
 
@@ -271,8 +277,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plsd(FfjlSdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -282,13 +289,13 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         List<GyzjFfjl> gyzjFfjlList = this.list(queryWrapper);
         List<GyzjFfjlJcgj> gyzjFfjlJcgjList = new ArrayList<>();
         if (gyzjFfjlList.size() <= 0) {
-            throw new ServiceException("发放记录发放记录不是未锁定状态，不能锁定");
+            throw new ServiceException("发放记录不是未锁定状态，不能锁定");
         }
         for (GyzjFfjl gyzjFfjl : gyzjFfjlList) {
             //锁定
             gyzjFfjl.setJlzt(JlztEnum.ysd.getValue());
             // 稽查轨迹
-            gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()));
+            gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
         }
         this.saveOrUpdateBatch(gyzjFfjlList);
         gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList);
@@ -303,22 +310,23 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sd(FfjlSdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
         GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
         if (gyzjFfjlOld == null) {
-            throw new ServiceException("发放记录发放记录不存在或已删除");
+            throw new ServiceException("发放记录不存在或已删除");
         }
         if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.wsd.getValue())) {
-            throw new ServiceException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能锁定");
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能锁定");
         }
         gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
 
     }
 
@@ -331,23 +339,24 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void js(FfjlJsForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
         GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
         if (gyzjFfjlOld == null) {
-            throw new ServiceException("发放记录发放记录不存在或已删除");
+            throw new ServiceException("发放记录不存在或已删除");
         }
         if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) {
-            throw new ServiceException("发放记录发放记录【" + gyzjFfjlOld.getMc() + "】不是已锁定状态，不能解锁");
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是已锁定状态，不能解锁");
         }
         //点击解锁，状态更新为入库；
         gyzjFfjlOld.setJlzt(JlztEnum.wsd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
 
     }
 
@@ -405,7 +414,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "归还");
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
 
     }
 
@@ -415,7 +424,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff( FfForm form, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
+    public void ff(FfForm form, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
         //region 新增发放记录
         GyzjFfjl gyzjFfjl = new GyzjFfjl();
@@ -445,22 +454,31 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         gyzjFfjl.setFfzytj(form.getZytj());
         gyzjFfjl.setFfrq(time);
         gyzjFfjl.setFfbz(form.getRemark());
-        gyzjFfjl.setMdIds( form.getMdIds());
+        gyzjFfjl.setMdIds(form.getMdIds());
         gyzjFfjl.setMdOther(form.getMdOther());
         this.save(gyzjFfjl);
         //endregion
 
         //region 新增试验物资
-        if(StringUtils.isNoneBlank(form.getMdIds())){
-            List<StudyGyzj> studyGyzjs=new ArrayList<>();
-            String [] tmp=form.getMdIds().split(",");
-            for(String s :tmp){
-                StudyGyzj studyGyzj=new StudyGyzj();
-                studyGyzj.setStudyId(Long.parseLong(s));
-                studyGyzj.setResourceId(gyzj.getId());
-                studyGyzjs.add(studyGyzj);
+        if (StringUtils.isNoneBlank(form.getMdIds())) {
+            QueryWrapper<StudyGyzj> queryWrapper = Wrappers.query();
+            queryWrapper.in("study_id", form.getMdIds());
+            queryWrapper.in("resource_id", gyzj.getId());
+            List<StudyGyzj> studyGyzjsOld = studyGyzjService.list(queryWrapper);
+            List<StudyGyzj> studyGyzjs = new ArrayList<>();
+            String[] tmp = form.getMdIds().split(",");
+            for (String s : tmp) {
+                List<StudyGyzj> existList = studyGyzjsOld.stream()
+                        .filter(p -> p.getStudyId().equals(Long.parseLong(s)))
+                        .collect(Collectors.toList());
+                if (existList.size() == 0) {
+                    StudyGyzj studyGyzj = new StudyGyzj();
+                    studyGyzj.setStudyId(Long.parseLong(s));
+                    studyGyzj.setResourceId(gyzj.getId());
+                    studyGyzjs.add(studyGyzj);
+                }
             }
-            if(studyGyzjs.size()>0){
+            if (studyGyzjs.size() > 0) {
                 studyGyzjService.insertBatch(studyGyzjs);
             }
         }
@@ -472,19 +490,22 @@ public class GyzjFfjlServiceImpl extends ServiceImpl<GyzjFfjlMapper, GyzjFfjl> i
         formData.put("转移条件", form.getZytj());
         formData.put("出库净重", gyzj.getKc() + gyzj.getKcdw());
         formData.put("目的", form.getMdMcs());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
 
     }
 
+
+
     /**
      * 验证密码
+     *
      * @param user
      * @param qmrmm
      */
-    public void checkPassword(SysUser user,String qmrmm){
-        if(StringUtils.isBlank(qmrmm)){
+    public void checkPassword(SysUser user, String qmrmm,Boolean needName) {
+        if (StringUtils.isBlank(qmrmm)) {
             throw new ServiceException("签名密码不能为空");
         }
-        sysUserService.checkPassword(user,qmrmm,false);
+        sysUserService.checkPassword(user, qmrmm, false);
     }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
index 95e2e21..5c24eed 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
@@ -142,7 +142,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void jd(JdForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -171,7 +171,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void jy(JyForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -207,7 +207,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void plgd(GdForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -242,7 +242,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void gd(GdForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -271,7 +271,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void plsd(SdForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -304,7 +304,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void sd(SdForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -332,7 +332,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void js(JsForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -360,7 +360,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void plczyj(PlczyjForm form) {
         SysUser clr = SecurityUtils.getLoginUser().getSysUser();
         //验证处理人密码
-        checkPassword(clr,form.getClrmm());
+        checkPassword(clr,form.getClrmm(),false);
 
         QueryWrapper<Gyzj> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
@@ -421,7 +421,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser clr = SecurityUtils.getLoginUser().getSysUser();
 
         //验证处理人密码
-        checkPassword(clr,form.getClrmm());
+        checkPassword(clr,form.getClrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -476,11 +476,11 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser fhr = sysUserService.selectUserById(form.getFhrId());
         SysUser jdr = sysUserService.selectUserById(form.getJdrId());
         //验证处理人密码
-        checkPassword(clr,form.getClrmm());
+        checkPassword(clr,form.getClrmm(),true);
         //验证复核人密码
-        checkPassword(fhr,form.getFhrmm());
+        checkPassword(fhr,form.getFhrmm(),true);
         //验证监督人密码
-        checkPassword(jdr,form.getJdrmm());
+        checkPassword(jdr,form.getJdrmm(),true);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -532,11 +532,11 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser fhr = sysUserService.selectUserById(form.getFhrId());
         SysUser jdr = sysUserService.selectUserById(form.getJdrId());
         //验证处理人密码
-        checkPassword(clr,form.getClrmm());
+        checkPassword(clr,form.getClrmm(),true);
         //验证复核人密码
-        checkPassword(fhr,form.getFhrmm());
+        checkPassword(fhr,form.getFhrmm(),true);
         //验证监督人密码
-        checkPassword(jdr,form.getJdrmm());
+        checkPassword(jdr,form.getJdrmm(),true);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -577,11 +577,11 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
         SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser();
         //验证领取人1密码
-        checkPassword(lqr1,form.getLqr1mm());
+        checkPassword(lqr1,form.getLqr1mm(),true);
         //验证领取人2密码
-        checkPassword(lqr2,form.getLqr2mm());
+        checkPassword(lqr2,form.getLqr2mm(),true);
         //验证发放人密码
-        checkPassword(ffr1,form.getFfrmm());
+        checkPassword(ffr1,form.getFfrmm(),true);
         Zcg zcg = zcgService.getById(form.getZcgId());
         if (zcg == null) {
             throw new ServiceException("暂存柜不存在或已删除");
@@ -608,7 +608,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
             formData.put("钥匙1领取人", lqr1.getNickName());
             formData.put("钥匙2领取人", lqr2.getNickName());
             formData.put("发放人", ffr1.getNickName());
-            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData,  ffr1,null));
+            gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData,  null,null));
         }
         if (StringUtils.isBlank(zcg.getGlyj())) {
             zcg.setGlyj(glyj);
@@ -640,13 +640,13 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id());
         //验证领取人1密码
-        checkPassword(lqr1,form.getLqr1mm());
+        checkPassword(lqr1,form.getLqr1mm(),true);
         //验证领取人2密码
-        checkPassword(lqr2,form.getLqr2mm());
+        checkPassword(lqr2,form.getLqr2mm(),true);
         //验证发放人1密码
-        checkPassword(ffr1,form.getFfr1mm());
+        checkPassword(ffr1,form.getFfr1mm(),true);
         //验证发放人2密码
-        checkPassword(ffr2,form.getFfr2mm());
+        checkPassword(ffr2,form.getFfr2mm(),true);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -704,13 +704,13 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id());
         //验证领取人1密码
-        checkPassword(lqr1,form.getLqr1mm());
+        checkPassword(lqr1,form.getLqr1mm(),true);
         //验证领取人2密码
-        checkPassword(lqr2,form.getLqr2mm());
+        checkPassword(lqr2,form.getLqr2mm(),true);
         //验证发放人1密码
-        checkPassword(ffr1,form.getFfr1mm());
+        checkPassword(ffr1,form.getFfr1mm(),true);
         //验证发放人2密码
-        checkPassword(ffr2,form.getFfr2mm());
+        checkPassword(ffr2,form.getFfr2mm(),true);
         QueryWrapper<Gyzj> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
         queryWrapper.eq("zjzt", ZjztEnum.rk.getValue());
@@ -775,7 +775,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void bj(BjForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -824,7 +824,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void shbj(ShbjForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -879,7 +879,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void xgkc(XgkcForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -927,7 +927,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public void shxgkc(ShxgkcForm form) {
         SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(qmr,form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -974,9 +974,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser ghr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id());
         //验证归还人1密码
-        checkPassword(ghr1,form.getGhr1mm());
+        checkPassword(ghr1,form.getGhr1mm(),true);
         //验证归还人2密码
-        checkPassword(ghr2,form.getGhr2mm());
+        checkPassword(ghr2,form.getGhr2mm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -1027,9 +1027,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
         //验证接收人1密码
-        checkPassword(jsr1,form.getJsr1mm());
+        checkPassword(jsr1,form.getJsr1mm(),true);
         //验证接收人2密码
-        checkPassword(jsr2,form.getJsr2mm());
+        checkPassword(jsr2,form.getJsr2mm(),true);
         
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -1085,9 +1085,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser qmr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id());
         //验证签名人1密码
-        checkPassword(qmr1,form.getQmr1mm());
+        checkPassword(qmr1,form.getQmr1mm(),true);
         //验证签名人2密码
-        checkPassword(qmr2,form.getQmr2mm());
+        checkPassword(qmr2,form.getQmr2mm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -1137,9 +1137,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
         //验证接收人1密码
-        checkPassword(jsr1,form.getJsr1mm());
+        checkPassword(jsr1,form.getJsr1mm(),true);
         //验证接收人2密码
-        checkPassword(jsr2,form.getJsr2mm());
+        checkPassword(jsr2,form.getJsr2mm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -1183,16 +1183,75 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         this.updateById(gyzjOld);
     }
 
+
+    /**
+     * 存储
+     *
+     * @param form
+     */
+    @Override
+    public void cc(CcForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id());
+        //验证签名人密码
+        checkPassword(qmr,form.getQmr1mm(),true);
+        checkPassword(qmr2,form.getQmr2mm(),true);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        Gyzj gyzjOld = this.getById(form.getId());
+        if (gyzjOld == null) {
+            throw new ServiceException("给药制剂不存在或已删除");
+        }
+        if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能解锁");
+        }
+        gyzjOld.setCczt(CcztEnum.Cc.getValue());
+        this.updateById(gyzjOld);
+        //稽查轨迹
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 取出
+     *
+     * @param form
+     */
+    @Override
+    public void qc(CcForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id());
+        //验证签名人密码
+        checkPassword(qmr,form.getQmr1mm(),true);
+        checkPassword(qmr2,form.getQmr2mm(),true);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        Gyzj gyzjOld = this.getById(form.getId());
+        if (gyzjOld == null) {
+            throw new ServiceException("给药制剂不存在或已删除");
+        }
+        if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能解锁");
+        }
+        gyzjOld.setCczt(CcztEnum.Qc.getValue());
+        this.updateById(gyzjOld);
+        //稽查轨迹
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
     /**
      * 验证密码
      * @param user
      * @param qmrmm
      */
-    public void checkPassword(SysUser user,String qmrmm){
+    public void checkPassword(SysUser user,String qmrmm,Boolean needName){
         if(StringUtils.isBlank(qmrmm)){
             throw new ServiceException("签名密码不能为空");
         }
-        sysUserService.checkPassword(user,qmrmm,false);
+        sysUserService.checkPassword(user,qmrmm,needName);
     }
 
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java
index 7871db6..6a187bc 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java
@@ -106,8 +106,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jq(FfjlJqForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -119,7 +120,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
             throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能加签");
         }
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, qmr,form.getRemark());
     }
 
     /**
@@ -130,8 +131,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jy(FfjlJyForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -154,7 +156,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, qmr,form.getRemark());
     }
 
     /**
@@ -179,8 +181,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jd(FfjlJdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -195,7 +198,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         mjyFfjlOld.setJlzt(JlztEnum.djd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
     }
 
     /**
@@ -206,8 +209,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plgd(FfjlGdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -225,7 +229,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 mjyFfjl.setJlzt(JlztEnum.dgd.getValue());
                 // 稽查轨迹
-                mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()));
+                mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
             }
             this.updateBatchById(mjyFfjlList);
             mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
@@ -240,8 +244,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void gd(FfjlGdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -256,7 +261,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         mjyFfjlOld.setJlzt(JlztEnum.dgd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
 
     }
 
@@ -269,8 +274,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plsd(FfjlSdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -286,7 +292,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
             //锁定
             mjyFfjl.setJlzt(JlztEnum.ysd.getValue());
             // 稽查轨迹
-            mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()));
+            mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
         }
         this.updateBatchById(mjyFfjlList);
         mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
@@ -301,8 +307,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sd(FfjlSdForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -316,7 +323,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
 
     }
 
@@ -329,8 +336,9 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void js(FfjlJsForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
+        checkPassword(qmr,form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -345,7 +353,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
         mjyFfjlOld.setJlzt(JlztEnum.wsd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
 
     }
 
@@ -481,10 +489,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl<MjyFfjlMapper, MjyFfjl> impl
      * @param user
      * @param qmrmm
      */
-    public void checkPassword(SysUser user,String qmrmm){
+    public void checkPassword(SysUser user,String qmrmm,Boolean needName){
         if(StringUtils.isBlank(qmrmm)){
             throw new ServiceException("签名密码不能为空");
         }
-        sysUserService.checkPassword(user,qmrmm,false);
+        sysUserService.checkPassword(user,qmrmm,needName);
     }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
index 6f878ed..b8b5448 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
@@ -137,8 +137,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jd(JdForm form) {
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -153,7 +154,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         mjyOld.setZjzt(ZjztEnum.djd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null,  SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
     }
 
     /**
@@ -164,8 +165,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void jy(JyForm form) {
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -188,7 +190,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, qmr, form.getRemark());
     }
 
     /**
@@ -199,8 +201,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plgd(GdForm form) {
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -218,7 +221,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 mjy.setZjzt(ZjztEnum.dgd.getValue());
                 //稽查轨迹
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()));
             }
             this.updateBatchById(mjyList);
             mjyJcgjService.saveBatch(mjyJcgjList);
@@ -233,8 +236,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void gd(GdForm form) {
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -249,7 +253,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         mjyOld.setZjzt(ZjztEnum.dgd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark());
     }
 
 
@@ -261,8 +265,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plsd(SdForm form) {
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
         }
@@ -278,7 +283,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
             //锁定
             mjy.setZjzt(ZjztEnum.ysd.getValue());
             //稽查轨迹
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()));
         }
         this.updateBatchById(mjyList);
         mjyJcgjService.saveBatch(mjyJcgjList);
@@ -293,8 +298,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sd(SdForm form) {
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -308,7 +314,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         mjyOld.setZjzt(ZjztEnum.ysd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark());
     }
 
 
@@ -320,8 +326,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void js(JsForm form) {
+        SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -336,7 +343,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         mjyOld.setZjzt(ZjztEnum.rk.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.orange.getValue(),null,qmr, form.getRemark());
     }
 
     /**
@@ -347,15 +354,15 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plczyj(PlczyjForm form) {
-        SysUser clr = sysUserService.selectUserById(form.getClrId());
+        SysUser clr = SecurityUtils.getLoginUser().getSysUser();
         SysUser fhr = sysUserService.selectUserById(form.getFhrId());
         SysUser jdr = sysUserService.selectUserById(form.getJdrId());
         //验证处理人密码
-        checkPassword(clr, form.getClrmm());
+        checkPassword(clr, form.getClrmm(),true);
         //验证复核人密码
-        checkPassword(fhr, form.getFhrmm());
+        checkPassword(fhr, form.getFhrmm(),true);
         //验证监督人密码
-        checkPassword(jdr, form.getJdrmm());
+        checkPassword(jdr, form.getJdrmm(),true);
 
         QueryWrapper<Mjy> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
@@ -390,7 +397,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                 formData.put("处置人", clr.getNickName());
                 formData.put("复核人", fhr.getNickName());
                 formData.put("监督人", jdr.getNickName());
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), null));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData,null, null));
                 //台账
                 mjyTzList.add(mjyTzService.getTz(mjy.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",mjyPlffItemFilter.get(0).getCzl(),mjy.getKcdw(),mjyPlffItemFilter.get(0).getCzyy()));
             } else {
@@ -412,16 +419,16 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Transactional(rollbackFor = Exception.class)
     public void czyj(CzyjForm form) {
 
-        SysUser clr = sysUserService.selectUserById(form.getClrId());
+        SysUser clr = SecurityUtils.getLoginUser().getSysUser();
         SysUser fhr = sysUserService.selectUserById(form.getFhrId());
         SysUser jdr = sysUserService.selectUserById(form.getJdrId());
 
         //验证处理人密码
-        checkPassword(clr, form.getClrmm());
+        checkPassword(clr, form.getClrmm(),true);
         //验证复核人密码
-        checkPassword(fhr, form.getFhrmm());
+        checkPassword(fhr, form.getFhrmm(),true);
         //验证监督人密码
-        checkPassword(jdr, form.getJdrmm());
+        checkPassword(jdr, form.getJdrmm(),true);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -446,7 +453,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         formData.put("处置人", clr.getNickName());
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null);
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, null, null);
 
         //台账
         mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",form.getCzl(),mjyOld.getKcdw(),form.getCzyy());
@@ -462,15 +469,15 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void plczrq(PlczrqForm form) {
-        SysUser clr = sysUserService.selectUserById(form.getClrId());
+        SysUser clr = SecurityUtils.getLoginUser().getSysUser();
         SysUser fhr = sysUserService.selectUserById(form.getFhrId());
         SysUser jdr = sysUserService.selectUserById(form.getJdrId());
         //验证处理人密码
-        checkPassword(clr, form.getClrmm());
+        checkPassword(clr, form.getClrmm(),true);
         //验证复核人密码
-        checkPassword(fhr, form.getFhrmm());
+        checkPassword(fhr, form.getFhrmm(),true);
         //验证监督人密码
-        checkPassword(jdr, form.getJdrmm());
+        checkPassword(jdr, form.getJdrmm(),true);
 
         if (form.getIds().length < 0) {
             throw new ServiceException("参数ids不正确");
@@ -497,7 +504,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                 formData.put("处置人", clr.getNickName());
                 formData.put("复核人", fhr.getNickName());
                 formData.put("监督人", jdr.getNickName());
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData,null , null));
                 //台账
                 mjyTzList.add(mjyTzService.getTz(mjy.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,mjyPlffItemFilter.get(0).getCzyy()));
                 mjy.setRqzt(RqztEnum.ycz.getValue());
@@ -519,15 +526,15 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void czrq(CzrqForm form) {
-        SysUser clr = sysUserService.selectUserById(form.getClrId());
+        SysUser clr = SecurityUtils.getLoginUser().getSysUser();
         SysUser fhr = sysUserService.selectUserById(form.getFhrId());
         SysUser jdr = sysUserService.selectUserById(form.getJdrId());
         //验证处理人密码
-        checkPassword(clr, form.getClrmm());
+        checkPassword(clr, form.getClrmm(),true);
         //验证复核人密码
-        checkPassword(fhr, form.getFhrmm());
+        checkPassword(fhr, form.getFhrmm(),true);
         //验证监督人密码
-        checkPassword(jdr, form.getJdrmm());
+        checkPassword(jdr, form.getJdrmm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -551,7 +558,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         formData.put("处置人", clr.getNickName());
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null);
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData,  null,null);
 
         //台账
         mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,form.getCzyy());
@@ -568,13 +575,13 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     public void ysff(YsffForm form) {
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
-        SysUser ffr1 = sysUserService.selectUserById(form.getFfrId());
+        SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser();
         //验证领取人1密码
-        checkPassword(lqr1, form.getLqr1mm());
+        checkPassword(lqr1, form.getLqr1mm(),true);
         //验证领取人2密码
-        checkPassword(lqr2, form.getLqr2mm());
+        checkPassword(lqr2, form.getLqr2mm(),true);
         //验证发放人密码
-        checkPassword(ffr1, form.getFfrmm());
+        checkPassword(ffr1, form.getFfrmm(),true);
 
         Zcg zcg = zcgService.getById(form.getZcgId());
         if (zcg == null) {
@@ -602,7 +609,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
             formData.put("钥匙1领取人", lqr1.getNickName());
             formData.put("钥匙2领取人", lqr2.getNickName());
             formData.put("发放人", ffr1.getNickName());
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData,  null,null));
         }
         if (StringUtils.isBlank(zcg.getGlyj())) {
             zcg.setGlyj(glyj);
@@ -633,13 +640,13 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id());
         //验证领取人1密码
-        checkPassword(lqr1, form.getLqr1mm());
+        checkPassword(lqr1, form.getLqr1mm(),true);
         //验证领取人2密码
-        checkPassword(lqr2, form.getLqr2mm());
+        checkPassword(lqr2, form.getLqr2mm(),true);
         //验证发放人1密码
-        checkPassword(ffr1, form.getFfr1mm());
+        checkPassword(ffr1, form.getFfr1mm(),true);
         //验证发放人2密码
-        checkPassword(ffr2, form.getFfr2mm());
+        checkPassword(ffr2, form.getFfr2mm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -663,7 +670,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         formData.put("转移条件", form.getZytj());
         formData.put("出库毛重", form.getCkmz() + mjyOld.getKcdw());
         formData.put("目的", form.getMdIds());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData,  ffr1,form.getRemark());
         //台账
         mjyTzService.saveTz(mjyOld.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",mjyOld.getKc(),mjyOld.getKcdw(),form.getRemark());
 
@@ -702,13 +709,13 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id());
         //验证领取人1密码
-        checkPassword(lqr1, form.getLqr1mm());
+        checkPassword(lqr1, form.getLqr1mm(),true);
         //验证领取人2密码
-        checkPassword(lqr2, form.getLqr2mm());
+        checkPassword(lqr2, form.getLqr2mm(),true);
         //验证发放人1密码
-        checkPassword(ffr1, form.getFfr1mm());
+        checkPassword(ffr1, form.getFfr1mm(),true);
         //验证发放人2密码
-        checkPassword(ffr2, form.getFfr2mm());
+        checkPassword(ffr2, form.getFfr2mm(),true);
 
         QueryWrapper<Mjy> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
@@ -738,7 +745,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                 formData.put("转移条件", plffItemFilter.get(0).getZytj());
                 formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + mjy.getKcdw());
                 formData.put("目的", plffItemFilter.get(0).getMdIds());
-                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),plffItemFilter.get(0).getRemark()));
+                mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData,  ffr1,plffItemFilter.get(0).getRemark()));
                 //台账
                 mjyTzList.add(mjyTzService.getTz(mjy.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",mjy.getKc(),mjy.getKcdw(),plffItemFilter.get(0).getRemark()));
                 //更新发放信息
@@ -776,8 +783,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void bj(BjForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -798,7 +806,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
             throw new ServiceException("你没有修改任何内容");
         }
         for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(),  SecurityUtils.getLoginUser().getSysUser(),null));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr,null));
         }
         mjyOld.setMcbj(form.getMc());
         mjyOld.setNdbj(form.getNd());
@@ -823,8 +831,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void shbj(ShbjForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -849,9 +858,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
             mjyOld.setNddw(mjyOld.getNddwbj());
             mjyOld.setNd(mjyOld.getNdbj());
             mjyOld.setMc(mjyOld.getMcbj());
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null);
+            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData,  qmr,null);
         } else {
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null);
+            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData,  qmr,null);
         }
         //清空编辑信息
         mjyOld.setMcbj(null);
@@ -876,8 +885,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void xgkc(XgkcForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -898,7 +908,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         List<MjyJcgj> mjyJcgjList = new ArrayList<>();
         //region 稽查轨迹
         for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
-            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(),  SecurityUtils.getLoginUser().getSysUser(),null));
+            mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(),  qmr,null));
         }
         //endregion
 
@@ -923,8 +933,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void shxgkc(ShxgkcForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm());
+        checkPassword(qmr, form.getQmrmm(),false);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -943,11 +954,11 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         formData.put("申请备注", mjyOld.getKcbjbz());
         formData.put("审核备注", form.getRemark());
         if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) {
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null);
+            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr,null);
             mjyOld.setKcdw(mjyOld.getKcdwbj());
             mjyOld.setKc(mjyOld.getKcbj());
         } else {
-            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData,  SecurityUtils.getLoginUser().getSysUser(),null);
+            mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData,  qmr,null);
         }
         //台账
         mjyTzService.getTz(mjyOld.getId(),null,null,null,null,null,null,null,null,null,"修改库存",mjyOld.getKcbj(),mjyOld.getKcdw(),mjyOld.getKcbjbz());
@@ -972,13 +983,13 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
         //验证归还人1密码
-        checkPassword(ghr1, form.getGhr1mm());
+        checkPassword(ghr1, form.getGhr1mm(),true);
         //验证归还人2密码
-        checkPassword(ghr2, form.getGhr2mm());
+        checkPassword(ghr2, form.getGhr2mm(),true);
         //验证接收人1密码
-        checkPassword(jsr1, form.getJsr1mm());
+        checkPassword(jsr1, form.getJsr1mm(),true);
         //验证接收人2密码
-        checkPassword(jsr2, form.getJsr2mm());
+        checkPassword(jsr2, form.getJsr2mm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -1028,13 +1039,13 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser();
         SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
         //验证签名人1密码
-        checkPassword(qmr1, form.getQmr1mm());
+        checkPassword(qmr1, form.getQmr1mm(),true);
         //验证签名人2密码
-        checkPassword(qmr2, form.getQmr2mm());
+        checkPassword(qmr2, form.getQmr2mm(),true);
         //验证接收人1密码
-        checkPassword(jsr1, form.getJsr1mm());
+        checkPassword(jsr1, form.getJsr1mm(),true);
         //验证接收人2密码
-        checkPassword(jsr2, form.getJsr2mm());
+        checkPassword(jsr2, form.getJsr2mm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
@@ -1067,16 +1078,74 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
 
 
     /**
+     * 存储
+     *
+     * @param form
+     */
+    @Override
+    public void cc(com.hxhq.business.form.mjy.CcForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id());
+        //验证签名人密码
+        checkPassword(qmr,form.getQmr1mm(),true);
+        checkPassword(qmr2,form.getQmr2mm(),true);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        Mjy mjyOld = this.getById(form.getId());
+        if (mjyOld == null) {
+            throw new ServiceException("麻精药不存在或已删除");
+        }
+        if (!mjyOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是已发放状态，不能解锁");
+        }
+        mjyOld.setCczt(CcztEnum.Cc.getValue());
+        this.updateById(mjyOld);
+        //稽查轨迹
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 取出
+     *
+     * @param form
+     */
+    @Override
+    public void qc(com.hxhq.business.form.mjy.CcForm form) {
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        SysUser qmr2=sysUserService.selectUserById(form.getQmr2Id());
+        //验证签名人密码
+        checkPassword(qmr,form.getQmr1mm(),true);
+        checkPassword(qmr2,form.getQmr2mm(),true);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        Mjy mjyOld = this.getById(form.getId());
+        if (mjyOld == null) {
+            throw new ServiceException("麻精药不存在或已删除");
+        }
+        if (!mjyOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是已发放状态，不能解锁");
+        }
+        mjyOld.setCczt(CcztEnum.Qc.getValue());
+        this.updateById(mjyOld);
+        //稽查轨迹
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "取出", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    /**
      * 验证密码
      *
      * @param user
      * @param qmrmm
      */
-    public void checkPassword(SysUser user, String qmrmm) {
+    public void checkPassword(SysUser user, String qmrmm,Boolean needName) {
         if (StringUtils.isBlank(qmrmm)) {
             throw new ServiceException("签名密码不能为空");
         }
-        sysUserService.checkPassword(user, qmrmm, false);
+        sysUserService.checkPassword(user, qmrmm, needName);
     }
 
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java
index e356457..f31ddba 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java
@@ -71,6 +71,8 @@ public class GyzjJcnrUtil {
         mapQmyy.put("归还","Return");
         mapQmyy.put("确认归还","Confirm Check-in");
         mapQmyy.put("领取发放","Distribution");
+        mapQmyy.put("存储","Storage");
+        mapQmyy.put("取出","Take Out");
 
         mapQmyy.put("锁定发放记录","锁定发放记录");
         mapQmyy.put("解锁发放记录","解锁发放记录");
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java
index 2b55475..c42d15f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java
@@ -68,6 +68,8 @@ public class MjyJcnrUtil {
         mapQmyy.put("拒绝修改库存","Reject Change Inventory");
         mapQmyy.put("归还","Return");
         mapQmyy.put("领取发放","Distribution");
+        mapQmyy.put("存储","Storage");
+        mapQmyy.put("取出","Take Out");
 
         mapQmyy.put("锁定发放记录","锁定发放记录");
         mapQmyy.put("解锁发放记录","解锁发放记录");