From 61dbd29b0d7e1eb5997e71713e00c18b9deabf99 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Mon, 9 Mar 2026 10:07:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hxhq/business/dto/study/StudyFormFillResource.java  | 2 +-
 .../java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java
index 8e38f48..ca43472 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillResource.java
@@ -38,7 +38,7 @@ public class StudyFormFillResource {
     private String ly;
 
     /**
-     * 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品（产生的为null）
+     * 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 9：细胞；11：细菌
      */
     @JsonSetter(nulls = Nulls.SKIP)
     private Integer type=null;
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 c25b5f5..c1dc9b1 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
@@ -630,7 +630,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
                 //生成检测板
                 genJcbList(studyFormFillOld, studyFormFill.getRemark());
                 //生成细胞细菌 弃用
-//                genXbxj(studyFormFill, studyFormFill.getRemark());
+//                genXbxj(studyFormFill, studyFormFill.getXbxj());
             }
             //生成物资
             genResource(studyFormFillOld, studyFormFill.getRemark());
@@ -660,7 +660,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
             //生成检测板
             genJcbList(studyFormFill, studyFormFill.getRemark());
             //生成细胞细菌 弃用
-//            genXbxj(studyFormFill, studyFormFill.getRemark());
+//            genXbxj(studyFormFill, studyFormFill.getXbxj());
             //生成物资
             genResource(studyFormFill, studyFormFill.getRemark());
             //稽查轨迹