From b89d6bd607c9c20c51cb50a2bdd1f7accac6b446 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 22 Jan 2026 14:15:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86]=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxhq/business/enums/zykgl/daztEnum.java    | 51 ++++++++++++++++++++++
 .../business/service/impl/GyzjServiceImpl.java     |  1 +
 .../com/hxhq/business/utils/lang/GyzjJcnrUtil.java |  6 +--
 .../com/hxhq/business/utils/lang/MjyJcnrUtil.java  |  2 +-
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/daztEnum.java

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/daztEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/daztEnum.java
new file mode 100644
index 0000000..bffdcf6
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/daztEnum.java
@@ -0,0 +1,51 @@
+package com.hxhq.business.enums.zykgl;
+
+/**
+ * 档案状态：1：未归档；3：已归档
+ * @author tanfei
+ */
+public enum daztEnum {
+
+    /**
+     * 未归档
+     */
+    wgd(1, "未归档"),
+
+    /**
+     * 已归档
+     */
+    ygd(3, "已归档");
+
+    private int value;
+    private String text;
+
+    daztEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public static daztEnum getEnumByValue(int type) {
+        for (daztEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}
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 3620dc1..04688fc 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
@@ -1278,6 +1278,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
     public List<ListDto> queryArchiveList(SearchForm form){
         QueryWrapper<Gyzj> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
+        queryWrapper.eq("t.`dazt`", daztEnum.ygd.getValue());
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
             queryWrapper.eq("t.jyzt", form.getJyzt());
         }
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 e19caf3..a1492a5 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
@@ -74,7 +74,7 @@ public class GyzjJcnrUtil {
         mapLang.put("基本信息","Information");
         mapLang.put("表单信息","Record Information");
         mapLang.put("稽查轨迹","Track Record");
-        mapLang.put("给药制剂台账","Dose Table");
+        mapLang.put("给药制剂台账","Formulation Table");
         mapLang.put("备注","Comment");
         mapLang.put("签名人","Signed By");
 
@@ -97,12 +97,12 @@ public class GyzjJcnrUtil {
         mapLang.put("领取发放","Distribution");
         mapLang.put("存储","Storage");
         mapLang.put("取出","Take Out");
-        mapLang.put("给药制剂详情","Dose Information");
+        mapLang.put("给药制剂详情","Formulation Information");
 
         mapLang.put("表单名称","Preset Name");
         mapLang.put("锁定发放记录","Lock Record");
         mapLang.put("解锁发放记录","Unlock Record");
-        mapLang.put("给药制剂入库","Dose Formulation Check-in");
+        mapLang.put("给药制剂入库","Formulation Check-in");
         mapLang.put("同意入库","Approve Check-in");
         mapLang.put("拒绝入库","Reject Check-in");
         mapLang.put("目的","Purpose");
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 8149528..cd2430c 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
@@ -68,7 +68,7 @@ public class MjyJcnrUtil {
         mapLang.put("基本信息","Information");
         mapLang.put("表单信息","Record Information");
         mapLang.put("稽查轨迹","Track Record");
-        mapLang.put("给药制剂台账","Dose Table");
+        mapLang.put("给药制剂台账","Formulation Table");
         mapLang.put("备注","Comment");
         mapLang.put("签名人","Signed By");