提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml

@@ -53,7 +53,11 @@
         FROM fin_payment_reconciliation t
         LEFT JOIN adm_patient patient ON patient.id = t.patient_id
         LEFT JOIN adm_practitioner pra ON pra.id = t.enterer_id
+<<<<<<< HEAD
         LEFT JOIN adm_invoice invoice ON invoice.reconciliation_id = t.id
+=======
+        LEFT JOIN adm_invoice invoice ON invoice.reconciliation_id = t.id AND invoice.delete_flag = '0'
+>>>>>>> v1.3
         LEFT JOIN adm_encounter enc ON enc.id = t.enterer_id
         WHERE 1 = 1
         AND t.delete_flag = '0'
@@ -248,4 +252,18 @@
             #{chargeItemId}
         </foreach>
     </select>
+    <select id="getThreePartCallBackVoPage" resultType="com.openhis.web.paymentmanage.dto.ThreePartCallBackVo">
+        SELECT *
+        FROM
+            (select three.*,
+                    patient.name as patient_name,
+                    payment.payment_no as payment_no
+             from fin_three_part_pay_call_back three
+                      left join fin_payment_reconciliation payment on three.payment_id = payment.id
+                      left join adm_patient patient on payment.patient_id = patient.id
+             order by three.create_time DESC
+            ) as T1
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>