Prechádzať zdrojové kódy

发药记录查询退药申请记录移除

WANGJIALIANG 2 rokov pred
rodič
commit
1d8ea018de

+ 1 - 0
src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfSpiritAnestheticPrintMapper.java

@@ -259,6 +259,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       a.order_no = g.order_no and" +
             "       a.item_no = g.item_no and" +
             "       g.supply_code = k.supply_code and" +
+            "       isnull(a.confirm_flag,2) != 2 and" +
             "       <when test='sendDrugRecordVo.beginDate != null'>" +
             "       a.confirm_time<![CDATA[>]]>#{sendDrugRecordVo.beginDate} and" +
             "       </when>" +

+ 5 - 0
src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -1390,6 +1390,11 @@ function fitfymx(patientId, times, receiptNo, orderNo, groupNoOut) {
         },
         columns: [
             {
+                field: 'charge_item_code',
+                title: '编码',
+                align: "center",
+                valign: 'middle'
+            },{
                 field: 'drugname',
                 title: '品名',
                 align: "center",