挂号补单功能的完善

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

@@ -66,7 +66,7 @@
                T9.payment_id AS paymentId,
                T9.picture_url AS pictureUrl,
                T9.birth_date AS birthDate,
-               T9.identifier_no AS identifierNo
+               COALESCE(T9.identifier_no, T9.patient_bus_no, '') AS identifierNo
         from (
                  SELECT T1.tenant_id       AS tenant_id,
                         T1.id              AS encounter_id,
@@ -90,6 +90,7 @@
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
                         T8.birth_date      AS birth_date,
+                        T8.bus_no          AS patient_bus_no,
                         T18.identifier_no  AS identifier_no
                  FROM adm_encounter AS T1
                           LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
@@ -129,6 +130,8 @@
                                          ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
                                   FROM adm_patient_identifier
                                   WHERE delete_flag = '0'
+                                    AND identifier_no IS NOT NULL
+                                    AND identifier_no != ''
                              ) t
                              WHERE rn = 1
                           ) AS T18 ON T8.id = T18.patient_id