提交merge1.3

openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml

@@ -40,13 +40,14 @@
         FROM
         fin_payment_rec_detail T1
         LEFT JOIN adm_account T2 ON T1.account_id = T2."id"
+        LEFT  JOIN fin_payment_reconciliation T3 ON T3.ID = T1.reconciliation_id
         AND T2.delete_flag = '0'
         WHERE
         T1.reconciliation_id IN
         <foreach collection="paymentIdList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        AND T1.delete_flag = '0'
+        AND T3.kind_enum = #{kindEnum}
         AND T1.pay_enum NOT IN (310201,8,1,2,3,4,5,6,7,9,510100,340100,390100,390200,610100,640100,390400,620100,360100,999900,390300,9999981,360300)
         AND T1.delete_flag = '0';
     </select>