xiaochan il y a 3 ans
Parent
commit
9a8123f362

+ 2 - 2
src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -1009,7 +1009,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       exec_unit_name = (select rtrim(name) name from zd_unit_code where exec_unit = code),charge_date,trans_flag_yb, exec_unit, " +
             "       op_id_code = (select rtrim(name) name from a_employee_mi where code  = op_id_code)," +
             "       charge_code_name = (select rtrim(name) name from zd_charge_item where code = charge_code_mx),charge_code = 'xm' from zy_detail_charge " +
-            "where inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and ledger_sn = #{ledger} " +
+            "where inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and ledger_sn = #{ledger} and infant_flag = #{infantFlag} " +
             "  and charge_fee &lt; 0 and charge_code not like 'BILL%' " +
             "  and  trans_flag_yb not in (1,2) " +
             "  and ori_detail_sn is null " +
@@ -1031,7 +1031,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       exec_unit_name = (select rtrim(name) name from zd_unit_code where exec_unit = code),charge_date,trans_flag_yb,exec_unit, " +
             "       op_id_code = (select rtrim(name) name from a_employee_mi where code  = op_id_code)," +
             "       charge_code_name = (select top(1) rtrim(name) name from yp_zd_dict where code = charge_code_mx),charge_code = 'yp' from zy_detail_charge " +
-            "where inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and ledger_sn = #{ledger} " +
+            "where inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and ledger_sn = #{ledger} and infant_flag = #{infantFlag} " +
             "  and charge_fee &lt; 0 and charge_code  like 'BILL%' " +
             "  and  trans_flag_yb not in (1,2) " +
             "  and ori_detail_sn is null" +