From 1f699501eb1c761b5abe214a9691617daa55b384 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 29 Jan 2026 11:16:03 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E5=A1=AB=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95]=E6=96=B0=E5=A2=9E=E4=BB=AA=E5=99=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hxhq/business/domain/StudyFormFill.java | 11 +++++++++++
 .../hxhq/business/service/impl/StudyFormFillServiceImpl.java  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java
index fe7e0e8..80c6b0a 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java
@@ -71,6 +71,9 @@ public class StudyFormFill extends MpBaseEntity
     /** 物资信息 */
     private String resource;
 
+    /** 仪器物资信息 */
+    private String yqResource;
+
     /** 处置list */
     private String czlist;
 
@@ -141,6 +144,14 @@ public class StudyFormFill extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getYqResource() {
+        return yqResource;
+    }
+
+    public void setYqResource(String yqResource) {
+        this.yqResource = yqResource;
+    }
+
     public String getTemplateShowSn() {
         return templateShowSn;
     }
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 cfe11d7..90f752a 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
@@ -387,6 +387,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
             studyFormFillOld.setBdmc(studyFormFill.getBdmc());
             studyFormFillOld.setBdnr(studyFormFill.getBdnr());
             studyFormFillOld.setResource(studyFormFill.getResource());
+            studyFormFillOld.setYqResource(studyFormFill.getYqResource());
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
             studyFormFillOld.setTjsj(new Date());
             if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) {