挂号补单功能的完善

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterServiceImpl.java

@@ -44,8 +44,16 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
             // 生成就诊编码 医保挂号时是先生成码后生成实体
             encounter.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.ENCOUNTER_NUM.getPrefix(), 4));
         }
-        // 生成就诊序号 (患者ID + 科室ID 作为当日就诊号的唯一标识)
-        String preFix = encounter.getPatientId() + String.valueOf(encounter.getOrganizationId());
+        // 生成就诊序号：
+        // 1) 若挂号医生已传入（registrarId 充当挂号医生 ID），按“科室+医生+当日”递增
+        //    Key 示例：ORG-123-DOC-456 -> 1、2、3...
+        // 2) 否则按“科室+当日”递增
+        String preFix;
+        if (encounter.getRegistrarId() != null) {
+            preFix = "ORG-" + encounter.getOrganizationId() + "-DOC-" + encounter.getRegistrarId();
+        } else {
+            preFix = "ORG-" + encounter.getOrganizationId();
+        }
         encounter.setDisplayOrder(assignSeqUtil.getSeqNoByDay(preFix));
         // 患者ID
         Long patientId = encounter.getPatientId();