diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java
index 648f9ad..5d75d18 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java
@@ -32,4 +32,25 @@ public interface StudyFormApplyMapper extends BaseMapper<StudyFormApply>
      * @return
      */
     StudyFormApply queryInfo(@Param("id") Long id);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId);
+
+    /**
+     * 更新复核意见
+     * @param id
+     * @param fhyjjl
+     */
+    void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl);
+
+    /**
+     * 更新字段勾选记录
+     * @param id
+     * @param zdgxjl
+     */
+    void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl);
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java
index 539935c..3b2b1ad 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java
@@ -30,4 +30,25 @@ public interface StudyFormPlanMapper extends BaseMapper<StudyFormPlan>
      * @return
      */
     StudyFormPlan queryInfo(@Param("id") Long id);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+
+    /**
+     * 更新复核意见
+     * @param id
+     * @param fhyjjl
+     */
+    void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl);
+
+    /**
+     * 更新字段勾选记录
+     * @param id
+     * @param zdgxjl
+     */
+    void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl);
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java
index cdc3a5a..cc802d0 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java
@@ -32,4 +32,25 @@ public interface StudyFormPreMapper extends BaseMapper<StudyFormPre>
      * @return
      */
     StudyFormPre queryInfo(@Param("id") Long id);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl);
+
+    /**
+     * 更新复核意见
+     * @param id
+     * @param fhyjjl
+     */
+    void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl);
+
+    /**
+     * 更新字段勾选记录
+     * @param id
+     * @param zdgxjl
+     */
+    void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl);
 }
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 e064f0a..686b14d 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
@@ -4,15 +4,21 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.gyzj.DetailDto;
 import com.hxhq.business.dto.gyzj.ListDto;
+import com.hxhq.business.dto.study.StudyFormFillCc;
+import com.hxhq.business.dto.study.StudyFormFillCz;
+import com.hxhq.business.dto.study.StudyFormFillResource;
 import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.gyzj.*;
 import com.hxhq.business.service.*;
+import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.DateUtils;
@@ -20,6 +26,7 @@ import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
 import com.hxhq.system.api.domain.SysUser;
 import com.hxhq.system.service.ISysUserService;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
index 80093d6..2976710 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
@@ -574,32 +574,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         JSONObject bdnr = JSONObject.parseObject(form.getBdnr());
-
-        //更新表单内容
-        StudyFormApply studyFormApplyOld = this.queryInfo(form.getId());
-        if (bdnr != null) {
-            if (bdnr.getInteger("syId") != null) {
-                studyFormApplyOld.setSyId(bdnr.getLong("syId"));
-            } else {
-                studyFormApplyOld.setSyId(null);
-            }
-            if (bdnr.getInteger("bmId") != null) {
-                studyFormApplyOld.setBmId(bdnr.getLong("bmId"));
-            } else {
-                studyFormApplyOld.setBmId(null);
-            }
-            if (bdnr.getInteger("sdId") != null) {
-                studyFormApplyOld.setSdId(bdnr.getLong("sdId"));
-            } else {
-                studyFormApplyOld.setSdId(null);
-            }
-        }
-        studyFormApplyOld.setBdnr(form.getBdnr());
-        studyFormApplyOld.setZdxgjl(form.getZdxgjl());
-        this.updateById(studyFormApplyOld);
-//        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
-        // {"type":"fieldChanged","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0333","title":"修改记录","time":"2026-01-14 19:44:02"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0","title":"修改记录","time":"2026-01-14 19:43:57"}]}
-        //稽查轨迹 todo
+        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl(),bdnr.getLong("syId"),bdnr.getLong("bmId"),bdnr.getLong("sdId"));
+        //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())) {
             JSONObject jsonObject = JSONObject.parseObject(form.getFiledValue());
             Map<String, String> formData = new LinkedHashMap<>();
@@ -638,10 +614,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        //更新复核意见 todo
-//        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
+        //更新复核意见
+        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
         StudyFormApply studyFormApplyOld = this.queryInfo(form.getId());
         studyFormApplyOld.setFhyjjl(form.getFhyjjl());
         this.updateById(studyFormApplyOld);
@@ -675,11 +649,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl<StudyFormApplyMapper,
      */
     @Override
     public void updateZdgxjl(StudyFormUpdateForm form) {
-        //更新勾选记录 todo
-        StudyFormApply studyFormApplyOld = this.queryInfo(form.getId());
-        studyFormApplyOld.setZdgxjl(form.getZdgxjl());
-        this.updateById(studyFormApplyOld);
-//        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
+        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
     /**
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 0252e02..aa893b6 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
@@ -636,15 +636,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
     @Override
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        //更新表单内容
-        StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
-        studyFormFillOld.setBdnr(form.getBdnr());
-        studyFormFillOld.setZdxgjl(form.getZdxgjl());
-        this.updateById(studyFormFillOld);
-//        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
-        // {"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","fieldCn":"试验基本信息-版本号",
-        // "fieldEn":"Test Basic Information-Version Number","oldValue":"2.0","value":"2.0333","title":"修改记录","time":"2026-01-15 19:51:46","reason":"555"}
-        //稽查轨迹 todo
+        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
+        //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())) {
             JSONObject jsonObject = JSONObject.parseObject(form.getFiledValue());
             Map<String, String> formData = new LinkedHashMap<>();
@@ -683,13 +676,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        //更新复核意见 todo
-//        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
-        StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
-        studyFormFillOld.setFhyjjl(form.getFhyjjl());
-        this.updateById(studyFormFillOld);
+        //更新复核意见
+        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
         Map<String, String> formData = new LinkedHashMap<>();
         Map<String, String> formDataEn = new LinkedHashMap<>();
         List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
@@ -720,11 +708,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
      */
     @Override
     public void updateZdgxjl(StudyFormUpdateForm form) {
-        //更新勾选记录 todo
-        StudyFormFill studyFormFillOld = this.queryInfo(form.getId());
-        studyFormFillOld.setZdgxjl(form.getZdgxjl());
-        this.updateById(studyFormFillOld);
-//        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
+        //更新勾选记录
+       baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
     /**
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
index 6fb24b4..5630b6c 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
@@ -382,13 +382,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
-        StudyFormPlan studyFormPlanOld = this.queryInfo(form.getId());
-        studyFormPlanOld.setBdnr(form.getBdnr());
-        studyFormPlanOld.setZdxgjl(form.getZdxgjl());
-        this.updateById(studyFormPlanOld);
-//        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
-        // {"type":"fieldChanged","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0333","title":"修改记录","time":"2026-01-14 19:44:02"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0","title":"修改记录","time":"2026-01-14 19:43:57"}]}
-        //稽查轨迹 todo
+        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
+        //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue())) {
 
             JSONObject jsonObject = JSONObject.parseObject(form.getFiledValue());
@@ -429,10 +424,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        //更新复核意见 todo
-//        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
+        //更新复核意见
+        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
         StudyFormPlan studyFormPlanOld = this.queryInfo(form.getId());
         studyFormPlanOld.setFhyjjl(form.getFhyjjl());
         this.updateById(studyFormPlanOld);
@@ -466,11 +459,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl<StudyFormPlanMapper, S
      */
     @Override
     public void updateZdgxjl(StudyFormUpdateForm form) {
-        //更新勾选记录 todo
-        StudyFormPlan studyFormPlanOld = this.queryInfo(form.getId());
-        studyFormPlanOld.setZdgxjl(form.getZdgxjl());
-        this.updateById(studyFormPlanOld);
-//        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
+        //更新勾选记录
+        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
     /**
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
index 4c55b79..e1f63f4 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
@@ -497,13 +497,8 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
     public void updateBdnr(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //更新表单内容
-        StudyFormPre studyFormPreOld = this.queryInfo(form.getId());
-        studyFormPreOld.setBdnr(form.getBdnr());
-        studyFormPreOld.setZdxgjl(form.getZdxgjl());
-        this.updateById(studyFormPreOld);
-//        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
-        // {"type":"fieldChanged","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0333","title":"修改记录","time":"2026-01-14 19:44:02"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0","title":"修改记录","time":"2026-01-14 19:43:57"}]}
-        //稽查轨迹 todo
+        baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl());
+        //稽查轨迹
 
         if (StringUtils.isNoneBlank(form.getFiledValue())) {
             JSONObject jsonObject = JSONObject.parseObject(form.getFiledValue());
@@ -544,10 +539,8 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
     @Override
     public void updateFhyjjl(StudyFormUpdateForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
-        //更新复核意见 todo
-//        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
+        //更新复核意见
+        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
         StudyFormPre studyFormPreOld = this.queryInfo(form.getId());
         studyFormPreOld.setFhyjjl(form.getFhyjjl());
         this.updateById(studyFormPreOld);
@@ -581,11 +574,8 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
      */
     @Override
     public void updateZdgxjl(StudyFormUpdateForm form) {
-        //更新勾选记录 todo
-        StudyFormPre studyFormPreOld = this.queryInfo(form.getId());
-        studyFormPreOld.setZdgxjl(form.getZdgxjl());
-        this.updateById(studyFormPreOld);
-//        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
+        //更新勾选记录
+        baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl());
     }
 
     /**
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java
index b108616..a49856f 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java
@@ -56,7 +56,7 @@ public class GyzjJcnrUtil {
         mapLang.put("存储条件","Storage Condition");
         mapLang.put("存储位置","Storage Location");
         mapLang.put("使用人","User");
-        mapLang.put("领取/归还人","Recipient/Returner");
+        mapLang.put("领取/归还人/入库申请人","Recipient/Returner/入库申请人");
         mapLang.put("发放/接收人","Issuer/Receiver");
         mapLang.put("操作类型","Action");
         mapLang.put("操作量","Amount");
@@ -113,7 +113,6 @@ public class GyzjJcnrUtil {
         mapLang.put("拒绝解档","拒绝解档");
         mapLang.put("同意借阅","同意借阅");
         mapLang.put("拒绝借阅","拒绝借阅");
-        mapLang.put("确认归还","确认归还");
     }
 
     public static void main(String[] args) {
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java
index 53e9cba..c8c7ae3 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java
@@ -92,6 +92,7 @@ public class MjyJcnrUtil {
         mapLang.put("领取发放","Distribution");
         mapLang.put("存储","Storage");
         mapLang.put("取出","Take Out");
+        mapLang.put("确认归还","Confirm Check-in");
 
         mapLang.put("表单名称","Preset Name");
         mapLang.put("锁定发放记录","Lock Record");
@@ -108,7 +109,6 @@ public class MjyJcnrUtil {
         mapLang.put("拒绝解档","拒绝解档");
         mapLang.put("同意借阅","同意借阅");
         mapLang.put("拒绝借阅","拒绝借阅");
-        mapLang.put("确认归还","确认归还");
 
     }
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java
index 83a49c4..0efc690 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java
@@ -110,7 +110,7 @@ public class Dosage {
         // 8. 创建表格
         PdfPTable table = new PdfPTable(8);
         table.setWidthPercentage(100);
-        String[] headers = {getName("使用人"),getName("领取/归还人"),getName("发放/接收人"),getName("操作类型"),getName("表单名称"),getName("操作量"),getName("备注/原因"),getName("操作时间")};
+        String[] headers = {getName("使用人"),getName("领取/归还人/入库申请人"),getName("发放/接收人"),getName("操作类型"),getName("表单名称"),getName("操作量"),getName("备注/原因"),getName("操作时间")};
         for (String header : headers) {
             PdfPCell cell = new PdfPCell(new Phrase(header, headerFont));
             cell.setHorizontalAlignment(Element.ALIGN_CENTER);
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml
index 287cbc7..f513fb9 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml
@@ -23,4 +23,17 @@
         join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
+
+    <update id="updateBdnr" >
+        update  t_study_form_apply set bdnr=#{bdnr},zdxgjl=#{zdxgjl},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId}  where id=#{id};
+    </update>
+
+    <update id="updateFhyjjl" >
+        update  t_study_form_apply set fhyjjl=#{fhyjjl}  where id=#{id};
+    </update>
+
+    <update id="updateZdgxjl" >
+        update  t_study_form_apply set zdgxjl=#{zdgxjl}  where id=#{id};
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml
index fdfec0e..5850153 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml
@@ -22,4 +22,17 @@
         join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
+
+    <update id="updateBdnr" >
+        update  t_study_form_plan set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
+    </update>
+
+    <update id="updateFhyjjl" >
+        update  t_study_form_plan set fhyjjl=#{fhyjjl}  where id=#{id};
+    </update>
+
+    <update id="updateZdgxjl" >
+        update  t_study_form_plan set zdgxjl=#{zdgxjl}  where id=#{id};
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
index c4c78e2..f6446e1 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
@@ -23,4 +23,17 @@
         join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
+
+    <update id="updateBdnr" >
+        update  t_study_form_pre set bdnr=#{bdnr},zdxgjl=#{zdxgjl}  where id=#{id};
+    </update>
+
+    <update id="updateFhyjjl" >
+        update  t_study_form_pre set fhyjjl=#{fhyjjl}  where id=#{id};
+    </update>
+
+    <update id="updateZdgxjl" >
+        update  t_study_form_pre set zdgxjl=#{zdgxjl}  where id=#{id};
+    </update>
+
 </mapper>
\ No newline at end of file