From ea2405595f2393934642a1443146224873ec45b7 Mon Sep 17 00:00:00 2001
From: "Wang.Huan" <wanghuan@ccbjb.com.cn>
Date: Fri, 7 Mar 2025 13:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B0=B1=E8=AF=8A=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/core/common/enums/AssignSeqEnum.java     | 10 ++++++----
 .../service/impl/EncounterServiceImpl.java       | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/openhis-server/core-common/src/main/java/com/core/common/enums/AssignSeqEnum.java b/openhis-server/core-common/src/main/java/com/core/common/enums/AssignSeqEnum.java
index 6ba34f2e..929bc5df 100644
--- a/openhis-server/core-common/src/main/java/com/core/common/enums/AssignSeqEnum.java
+++ b/openhis-server/core-common/src/main/java/com/core/common/enums/AssignSeqEnum.java
@@ -3,8 +3,6 @@
  */
 package com.core.common.enums;
 
-import com.core.common.utils.StringUtils;
-
 /**
  * 采番前缀枚举
  *
@@ -17,8 +15,12 @@ public enum AssignSeqEnum {
      * 例子
      */
     TEST("1", "例子", "TE"),
-    //患者编号
-    PATIENT_NUM("1", "患者编号", "PN");
+    // 患者编号
+    PATIENT_NUM("1", "患者编号", "PN"),
+    /**
+     * 就诊编号
+     */
+    ENCOUNTER_NUM("1", "就诊编号", "EN");
 
     private final String code;
     private final String info;
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
index 0d27c12a..dabe3750 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java
@@ -1,9 +1,13 @@
 package com.openhis.administration.service.impl;
 
+import javax.annotation.Resource;
+
+import com.core.common.enums.AssignSeqEnum;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.AssignSeqUtil;
 import com.openhis.administration.domain.Encounter;
 import com.openhis.administration.mapper.EncounterMapper;
 import com.openhis.administration.service.IEncounterService;
@@ -18,6 +22,9 @@ import com.openhis.common.enums.EncounterType;
 @Service
 public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter> implements IEncounterService {
 
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
     /**
      * 保存就诊信息
      *
@@ -26,10 +33,11 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
      */
     @Override
     public Long saveEncounterByRegister(Encounter encounter) {
-        // 生产就诊编码
-
-        // 生产就诊序号
-
+        // 生成就诊编码
+        encounter.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 8));
+        // 生成就诊序号 (患者ID + 科室ID 作为当日就诊号的唯一标识)
+        String preFix = encounter.getPatientId() + String.valueOf(encounter.getOrganizationId());
+        encounter.setDisplayOrder(assignSeqUtil.getSeqNoByDay(preFix));
         // 患者ID
         Long patientId = encounter.getPatientId();
         // 初复诊