From a5f4277a08dd99bc54a79cb1e8712a3486808ed4 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 6 Feb 2026 18:25:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/business/service/impl/GyzjServiceImpl.java    |  2 +-
 .../com/hxhq/business/service/impl/MjyServiceImpl.java     |  2 +-
 .../java/com/hxhq/business/service/impl/SjServiceImpl.java |  2 +-
 .../business/service/impl/StudyFormFillServiceImpl.java    | 14 ++++----------
 4 files changed, 7 insertions(+), 13 deletions(-)

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 deddf36..45fde80 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
@@ -1498,8 +1498,8 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
                             } else {
                                 this.updateById(gyzj);
                             }
-                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue());
                         }
+                        studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue());
                     } else {
                         //使用的才更新 Resource
                         studyFormFillResource.setMc(gyzj.getMc());
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 2e749ae..b0a449b 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
@@ -1284,8 +1284,8 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                             } else {
                                 this.updateById(mjy);
                             }
-                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue());
                         }
+                        studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue());
                     } else {
                         //使用的才更新 Resource
                         studyFormFillResource.setMc(mjy.getMc());
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java
index 9d2f822..4620d2b 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java
@@ -712,8 +712,8 @@ public class SjServiceImpl extends ServiceImpl<SjMapper, Sj> implements ISjServi
                             }
                             sjMap.put(sj.getBh(), sj);
                             sjList.add(sj);
-                            studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue());
                         }
+                        studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue());
                     }else{
                         //使用的才更新 Resource
                         studyFormFillResource.setMc(sj.getMc());
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
index ba28e50..c0fdf5c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
@@ -552,16 +552,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
      */
     public void genResource(StudyFormFill studyFormFill, String remark) {
         Template template = templateService.getById(studyFormFill.getTemplateId());
-        //第一次填报
-        if(studyFormFill.getSftb().equals(NormalEnum.no.getValue())){
-            // 处置，存放，用量
-            sjService.genResource(studyFormFill, template);
-            gyzjService.genResource(studyFormFill, template, remark);
-            mjyService.genResource(studyFormFill, template, remark);
-        }else{
-        //todo 再次修改 只是使用到的药剂，同步更新物资列表
-
-        }
+        // 处置，存放，用量
+        sjService.genResource(studyFormFill, template);
+        gyzjService.genResource(studyFormFill, template, remark);
+        mjyService.genResource(studyFormFill, template, remark);
         //更新 Resource
         this.updateById(studyFormFill);
     }