diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java
index ca58188..46b3b99 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java
@@ -25,7 +25,7 @@ public class GyzjFfjl extends MpBaseEntity
     private Integer jyzt;
 
     /** 给药制剂id */
-    private Long gyzjId;
+        private Long gyzjId;
 
     /** 名称 */
     private String mc;
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 199b639..a4e26ce 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
@@ -593,6 +593,12 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         if (gyzjList.size() <= 0) {
             throw new ServiceException("药剂已被发放,请不要重复发放");
         }
+        QueryWrapper<GyzjFfjl> gyzjFfjlQueryWrapper = Wrappers.query();
+        gyzjFfjlQueryWrapper.in("gyzj_id", form.getIds());
+        List<GyzjFfjl> gyzjFfjlList = gyzjFfjlService.list(gyzjFfjlQueryWrapper);
+        for (GyzjFfjl gyzjFfjl : gyzjFfjlList) {
+            gyzjFfjl.setZcgId(zcg.getId());
+        }
         String glyj = "";
         for (Gyzj gyzj : gyzjList) {
             //更新暂存柜id
@@ -623,7 +629,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         zcgService.updateById(zcg);
         this.updateBatchById(gyzjList);
         gyzjJcgjService.saveBatch(gyzjJcgjList);
-
+        if(gyzjFfjlList.size()>0){
+            gyzjFfjlService.updateBatchById(gyzjFfjlList);
+        }
     }
 
 
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 43c215e..b3aedc5 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
@@ -594,6 +594,12 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         if (mjyList.size() <= 0) {
             throw new ServiceException("药剂已被发放,请不要重复发放");
         }
+        QueryWrapper<MjyFfjl> mjyFfjlQueryWrapper = Wrappers.query();
+        mjyFfjlQueryWrapper.in("mjy_id", form.getIds());
+        List<MjyFfjl> mjyFfjlList = mjyFfjlService.list(mjyFfjlQueryWrapper);
+        for (MjyFfjl mjyFfjl : mjyFfjlList) {
+            mjyFfjl.setZcgId(zcg.getId());
+        }
         String glyj = "";
         for (Mjy mjy : mjyList) {
             //更新暂存柜id
@@ -624,6 +630,9 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
         zcgService.updateById(zcg);
         this.updateBatchById(mjyList);
         mjyJcgjService.saveBatch(mjyJcgjList);
+        if(mjyFfjlList.size()>0){
+            mjyFfjlService.updateBatchById(mjyFfjlList);
+        }
     }