挂号补单功能的完善

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java

@@ -141,4 +141,9 @@ public class CurrentDayEncounterDto {
      */
     private String identifierNo;
 
+    /**
+     * 流水号（就诊当日序号）
+     */
+    private Integer displayOrder;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/ReprintRegistrationDto.java

@@ -69,12 +69,3 @@ public class ReprintRegistrationDto {
 
 
 
-
-
-
-
-
-
-
-
-

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java

@@ -1818,6 +1818,10 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         // 保存就诊信息
         Encounter encounter = new Encounter();
         BeanUtils.copyProperties(encounterFormData, encounter);
+        // 将挂号医生ID提前塞入 encounter 的 registrarId，便于生成“科室+医生+当日”序号
+        if (encounterParticipantFormData.getPractitionerId() != null) {
+            encounter.setRegistrarId(encounterParticipantFormData.getPractitionerId());
+        }
         encounter.setBusNo(outpatientRegistrationSettleParam.getBusNo());
         // 就诊ID
         Long encounterId = iEncounterService.saveEncounterByRegister(encounter);

openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml

@@ -46,6 +46,7 @@
     <select id="getCurrentDayEncounter" resultType="com.openhis.web.chargemanage.dto.CurrentDayEncounterDto">
         SELECT T9.tenant_id AS tenantId,
                T9.encounter_id AS encounterId,
+               T9.display_order AS displayOrder,
                T9.organization_id AS organizationId,
                T9.organization_name AS organizationName,
                T9.healthcare_name AS healthcareName,
@@ -70,6 +71,7 @@
         from (
                  SELECT T1.tenant_id       AS tenant_id,
                         T1.id              AS encounter_id,
+                        T1.display_order   AS display_order,
                         T1.organization_id AS organization_id,
                         T2.NAME            AS organization_name,
                         T3.NAME            AS healthcare_name,