From 03b84bcc40587db72dcdd32d915829bc8684a64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=90=B3?= <陈琳@gentronhealth.com>
Date: Wed, 13 May 2026 11:02:28 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#496:=20=E3=80=90=E4=BD=8F=E9=99=A2?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E7=94=B3=E8=AF=B7=E3=80=91=E6=A3=80=E6=9F=A5=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E4=B8=8D=E8=A7=84=E8=8C=83=E5=8F=8A=E5=8D=95=E5=8F=B7=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=A7=84=E5=88=99=E4=B8=8D=E7=AC=A6=E5=90=88=E5=8C=BB?=
 =?UTF-8?q?=E7=96=97=E8=A1=8C=E4=B8=9A=E6=A0=87=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 前端列标题：处方号 → 申请单号（表格列 + 详情弹窗）
2. 后端单号生成：原用 PAR 处方号前缀 → 改为 JCZ + yyMMdd + 5位顺序号
3. 新增 AssignSeqEnum.CHECK_APPLY_NO 枚举项（JCZ 前缀）

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../impl/RequestFormManageAppServiceImpl.java        | 12 ++++--------
 .../java/com/openhis/common/enums/AssignSeqEnum.java |  4 ++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
index 667cd1695..fa71860e8 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -92,14 +92,10 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                 return R.fail("无待签发的医嘱,该申请单不可编辑");
             }
         } else {
-            // 诊疗处方号 - 按申请单类型生成不同规则的单号
-            if (ActivityDefCategory.TEST.getCode().equals(typeCode)) {
-                // 检查申请单：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
-                String dateStr = new SimpleDateFormat("yyMMdd").format(new Date());
-                prescriptionNo = "JCZ" + dateStr + assignSeqUtil.getSeq("JCZ_" + dateStr, 5);
-            } else {
-                prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
-            }
+            // 检查申请单号：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
+            String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date());
+            int seq = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.CHECK_APPLY_NO.getPrefix());
+            prescriptionNo = "JCZ" + dateStr + String.format("%05d", seq);
         }
 
         // 当前时间
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
index 22527a52d..3df82c5aa 100755
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
@@ -270,6 +270,10 @@ public enum AssignSeqEnum {
      * 诊疗处方号
      */
     ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"),
+    /**
+     * 检查申请单号（住院）
+     */
+    CHECK_APPLY_NO("72", "检查申请单号", "JCZ"),
     /**
      * b 病历文书
      */