Browse Source

修复paymark的问题

lighter 8 months ago
parent
commit
6b5292c299

+ 4 - 4
src/main/java/thyyxxk/webserver/dao/his/reports/QueryDrugsAndProjectsDao.java

@@ -77,7 +77,7 @@ public interface QueryDrugsAndProjectsDao {
             "<if test=\"chargeCode!=null and chargeCode!=''\">" +
             "and a.charge_item_code=#{chargeCode} " +
             "</if>" +
-            "  and a.pay_mark != '5' " +
+            "  and a.pay_mark not in ('5','8') " +
             "group by a.charge_item_code,a.serial,b.name,c.name" +
             "</script>")
     List<QueryDrugsAndProjects> queryProjects(QueryDrugsAndProjects param);
@@ -124,7 +124,7 @@ public interface QueryDrugsAndProjectsDao {
             "<if test=\"chargeCode!=null and chargeCode!=''\">" +
             "and a.charge_item_code=#{chargeCode} " +
             "</if>" +
-            "  and a.pay_mark != '5' " +
+            "  and a.pay_mark not in ('5','8') " +
             "group by a.charge_item_code, b.name " +
             "</script>")
     List<QueryDrugsAndProjects> inquireAboutMedicines(QueryDrugsAndProjects param);
@@ -183,7 +183,7 @@ public interface QueryDrugsAndProjectsDao {
             "           from mz_charge_detail a,mz_patient_mi b " +
             "where a.patient_id = b.patient_id " +
             "and charge_item_code = #{chargeCode} " +
-            "and a.pay_mark != '5' " +
+            "and a.pay_mark not in ('5','8') " +
             "and charge_date &gt;= #{startTime} and charge_date &lt;= #{endTime} " +
             "<if test=\"dept != '' and dept !=null \">" +
             "and a.exec_dept = #{dept} " +
@@ -242,7 +242,7 @@ public interface QueryDrugsAndProjectsDao {
             "</if>" +
             "and a.charge_item_code=b.code " +
             "and a.serial=b.serial " +
-            "and a.pay_mark != '5' " +
+            "and a.pay_mark not in ('5','8') " +
             "and b.drug_kind=c.code " +
             "<if test=\"drugCode!=null and drugCode!='' \">" +
             "and b.code=#{drugCode} " +