解决退号记录的退号操作工作取值问题

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

@@ -147,10 +147,9 @@ public class CurrentDayEncounterDto {
     private String operatorName;
 
     /**
-     * 退号操作工号
+     * 退号操作工号（用户账号）
      */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long operatorId;
+    private String operatorId;
 
     /**
      * 退款金额

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

@@ -96,7 +96,7 @@
                         T14.bill_date      AS return_date,
                         T14.refund_reason  AS return_reason,
                         T15."name"         AS operator_name,
-                        T14.enterer_id     AS operator_id,
+                        T17.user_name      AS operator_id,
                         ABS(T14.display_amount) AS refund_amount,
                         T6.contract_no     AS contract_no,
                         T16.refund_method  AS refund_method
@@ -134,6 +134,7 @@
                                         AND T14.status_enum = 3
                                         AND T14.payment_enum = 1
                           LEFT JOIN adm_practitioner AS T15 ON T15.ID = T14.enterer_id AND T15.delete_flag = '0'
+                          LEFT JOIN sys_user AS T17 ON T17.user_id = T15.user_id AND T17.delete_flag = '0'
                           -- 关联退号支付详情，获取退款方式（聚合多个支付方式）
                           LEFT JOIN (
                              SELECT reconciliation_id,