From b35250c5b0c23abbd1f91ec5b0658490ae5d3aee Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 30 Jan 2026 21:56:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E5=AD=97=E6=AE=B5=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/dto/study/StudyFormFillResource.java  | 33 +++++++---------------
 .../business/service/impl/GyzjServiceImpl.java     |  2 +-
 .../hxhq/business/service/impl/MjyServiceImpl.java |  2 +-
 .../hxhq/business/service/impl/SjServiceImpl.java  |  4 +--
 4 files changed, 14 insertions(+), 27 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 83c6703..8e02071 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
@@ -25,9 +25,14 @@ public class StudyFormFillResource {
     private String nd;
 
     /**
+     * 浓度单位
+     */
+    private String nddw;
+
+    /**
      * 来源
      */
-    private String source;
+    private String ly;
 
     /**
      * 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品（产生的为null）
@@ -40,16 +45,6 @@ public class StudyFormFillResource {
     private String sxrq;
 
     /**
-     * 浓度值
-     */
-    private Integer ndz;
-
-    /**
-     * 浓度单位
-     */
-    private String nddw;
-
-    /**
      * 库存
      */
     private String kc;
@@ -111,12 +106,12 @@ public class StudyFormFillResource {
         this.nd = nd;
     }
 
-    public String getSource() {
-        return source;
+    public String getLy() {
+        return ly;
     }
 
-    public void setSource(String source) {
-        this.source = source;
+    public void setLy(String ly) {
+        this.ly = ly;
     }
 
     public Integer getType() {
@@ -135,14 +130,6 @@ public class StudyFormFillResource {
         this.sxrq = sxrq;
     }
 
-    public Integer getNdz() {
-        return ndz;
-    }
-
-    public void setNdz(Integer ndz) {
-        this.ndz = ndz;
-    }
-
     public String getNddw() {
         return nddw;
     }
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 ac09407..044a7a8 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
@@ -1354,7 +1354,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
                         }
                         gyzj.setMc(studyFormFillResource.getMc());
                         gyzj.setBh(studyFormFillResource.getBh());
-                        gyzj.setNd(String.valueOf(studyFormFillResource.getNdz()));
+                        gyzj.setNd(String.valueOf(studyFormFillResource.getNd()));
                         gyzj.setNddw(studyFormFillResource.getNddw());
                         gyzj.setKc(String.valueOf(studyFormFillResource.getKc()));
                         gyzj.setKcdw(studyFormFillResource.getKcdw());
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 3b8fbc6..83ffe61 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
@@ -1259,7 +1259,7 @@ public class MjyServiceImpl extends ServiceImpl<MjyMapper, Mjy> implements IMjyS
                         }
                         mjy.setMc(studyFormFillResource.getMc());
                         mjy.setBh(studyFormFillResource.getBh());
-                        mjy.setNd(String.valueOf(studyFormFillResource.getNdz()));
+                        mjy.setNd(String.valueOf(studyFormFillResource.getNd()));
                         mjy.setNddw(studyFormFillResource.getNddw());
                         mjy.setKc(String.valueOf(studyFormFillResource.getKc()));
                         mjy.setKcdw(studyFormFillResource.getKcdw());
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 91a9d84..30fcb8f 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
@@ -678,11 +678,11 @@ public class SjServiceImpl extends ServiceImpl<SjMapper, Sj> implements ISjServi
                         }
                         sj.setMc(studyFormFillResource.getMc());
                         sj.setBh(studyFormFillResource.getBh());
-                        sj.setNd(String.valueOf(studyFormFillResource.getNdz()));
+                        sj.setNd(String.valueOf(studyFormFillResource.getNd()));
                         sj.setNddw(studyFormFillResource.getNddw());
                         sj.setKc(studyFormFillResource.getKc());
                         sj.setKcdw(studyFormFillResource.getKcdw());
-                        sj.setLy(studyFormFillResource.getSource());
+                        sj.setLy(studyFormFillResource.getLy());
                         sj.setSxr(DateUtils.parseDate(studyFormFillResource.getSxrq()));
                         sj.setPzrq(studyFormFill.getStartDate());
                         sj.setYxzq(studyFormFillResource.getYxzq());