From 2c5aaf173343bfa35e1605b11a64e621a09098bd Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 22 Jan 2026 18:10:10 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E6=A1=A3=E6=A1=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/GyzjArchiveController.java | 56 ----------------------
 .../business/service/impl/GyzjServiceImpl.java     |  2 +-
 2 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java
index 0db8dfa..de4d274 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java
@@ -61,62 +61,6 @@ public class GyzjArchiveController extends BaseController
     }
 
     /**
-     * 稽查轨迹列表
-     */
-    @RequiresPermissions("business:archive:gyzj:list")
-    @GetMapping("/jcgjList")
-    public TableDataInfo jcgjList(GyzjJcgj form)
-    {
-        startPage();
-        List<GyzjJcgj> list = gyzjJcgjService.queryList(form);
-        return getDataTable(list);
-    }
-
-    /**
-     * 台账列表
-     */
-    @RequiresPermissions("business:archive:gyzj:list")
-    @GetMapping("/tzList")
-    public TableDataInfo tzList(GyzjTz form)
-    {
-        startPage();
-        List<GyzjTz> list = gyzjTzService.queryList(form);
-        return getDataTable(list);
-    }
-
-    /**
-     * 详细信息
-     */
-    @RequiresPermissions("business:archive:gyzj:xq")
-    @GetMapping(value = "/info")
-    public AjaxResult getInfo(Long id)
-    {
-        return AjaxResult.success(gyzjService.queryInfo(id));
-    }
-
-    /**
-     * 导出
-     */
-    @RequiresPermissions("business:archive:gyzj:xq")
-    @GetMapping(value = "/exportDetail")
-    public AjaxResult exportDetail(Long id,String lang) {
-        GyzjJcgj gyzjJcgj = new GyzjJcgj();
-        gyzjJcgj.setGyzjId(id);
-        List<GyzjJcgj> gyzjJcgjList = gyzjJcgjService.queryList(gyzjJcgj);
-        GyzjTz gyzjTz = new GyzjTz();
-        gyzjTz.setGyzjId(id);
-        List<GyzjTz> gyzjTzList = gyzjTzService.queryList(gyzjTz);
-        return AjaxResult.success(localFilePrefix + PdfExportUtil.export(
-                "com.hxhq.business.utils.pdf.resource.Dosage",
-                "exportDetail",
-                gyzjService.queryInfo(id),
-                gyzjTzList,
-                gyzjJcgjList,
-                lang,
-                localFilePath));
-    }
-
-    /**
      * 同意归档
      */
     @PostMapping("/tygd")
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 784ca69..3bc49b8 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
@@ -1315,7 +1315,7 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         if (gyzjOld == null) {
             throw new ServiceException("给药制剂不存在或已删除");
         }
-        if (!gyzjOld.getZjzt().equals(ZjztEnum.ysd.getValue())) {
+        if (!gyzjOld.getZjzt().equals(ZjztEnum.dgd.getValue())) {
             throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是待归档状态，不能操作");
         }
         gyzjOld.setZjzt(ZjztEnum.gd.getValue());