科室药品请领显示药品医保编码，发药记录查询退药数量问题修改

src/main/java/cn/hnthyy/thmz/controller/yf/YfWardPrescriptionController.java

@@ -149,6 +149,7 @@ public class YfWardPrescriptionController {
                 yfWardVo.setDrugName(ypZdDict.getName());
                 yfWardVo.setSpecification(ypZdDict.getSpecification());
                 yfWardVo.setStockAmount(ypBaseYf.getStockAmount());
+                yfWardVo.setNationalCode(ypZdDict.getNationalCode());
                 yfWardVo.setPageClass(pageClass);
             });
             resultMap.put("code", 0);
@@ -361,6 +362,7 @@ public class YfWardPrescriptionController {
                 yfWardVo.setSpecification(ypZdDict.getSpecification());
                 yfWardVo.setStockAmount(ypBaseYf.getStockAmount());
                 yfWardVo.setManufactory(manufactory);
+                yfWardVo.setNationalCode(ypZdDict.getNationalCode());
                 yfWardVo.setPageClass(pageClass);
             });
             String pageNos = yfWardPrescriptionService.queryYzYpPageNoStr(groupNo, wardCode, pageClass);

src/main/java/cn/hnthyy/thmz/mapper/his/yf/YfSpiritAnestheticPrintMapper.java

@@ -215,7 +215,7 @@ public interface YfSpiritAnestheticPrintMapper {
             "       icd_text=cast(isnull(i.icd_text,'') as varchar(50))," +
             "       drug_name=d.name," +
             "       abbr_name=e.name," +
-            "       quantity = case when a.serial=d.serial then a.quantity*a.cy_fy else a.quantity*a.cy_fy/d.pack_size end," +
+            "       quantity = case when a.serial=d.serial then case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*cy_fy) else a.quantity*a.cy_fy end else case when a.receipt_no <![CDATA[<]]> '0' then -abs(a.quantity*a.cy_fy/d.pack_size) else a.quantity*a.cy_fy/d.pack_size end end," +
             "       d.specification," +
             "       charge_date=a.confirm_time," +
             "       employee_name=c.name," +

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -433,6 +433,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             yfWardVo.setDrugName(ypZdDict.getName());
             yfWardVo.setByjFlag(ypZdDict.getByjFlag());
             yfWardVo.setSpecification(ypZdDict.getSpecification());
+            yfWardVo.setNationalCode(ypZdDict.getNationalCode());
             yfWardVo.setManufactory(manufactory);
             yfWardVo.setPageClass(pageClass);
         }

src/main/java/cn/hnthyy/thmz/vo/YfWardVo.java

@@ -207,4 +207,6 @@ public class YfWardVo {
     private String dosage;
     //是否摆药机操作 1：是 0：否
     private Integer byjFlag;
+    //药品医保编码
+    private String nationalCode;
 }

src/main/resources/static/js/yf/ward_prescription.js

@@ -391,7 +391,7 @@ function initSummarizingTable() {
             groupText : ['<b>单号：'+pageNo+'</b>'],//组名的展示文字
             groupCollapse : false,//是否收起
         },
-        colNames: ['发药','拒退','单号','货位号','药品编码','药品名称','规格','发药量','原发药量','库存量','零售价','金额','生产厂家','药单类型','规格编号'],
+        colNames: ['发药','拒退','单号','货位号','药品编码','药品名称','规格','发药量','原发药量','库存量','零售价','金额','生产厂家','药单类型','规格编号','医保编码'],
         colModel: [
             {name: 'fybz', index: 'fybz',align:'center',width:30,editable:true,formatter : "select",hidden:pageClass=='T'?true:false,
                 edittype:"select",editoptions:{value : "0:发药;1:暂缓;2:拒发"},
@@ -425,6 +425,10 @@ function initSummarizingTable() {
             {name: 'manufactory', index: 'manufactory',align:'left',width:60},
             {name: 'pageClass', index: 'pageClass',align:'center',width:40},
             {name: 'serial', index: 'serial',align:'center',width:40,hidden:true},
+            {name: 'nationalCode', index: 'nationalCode',align:'left',width:40,
+                formatter:function(cellvalue, options, rowObject){
+                    return cellvalue == null ? "-" : cellvalue;
+                }}
         ],
         jsonReader: {
             root: "data", repeatitems: false
@@ -490,7 +494,7 @@ function initDetailTable() {
         grouping:true,
         colNames: ['发药','拒退','单号','住院号','床号','次数','姓名','药品名称','规格','数量','原发药量','零售价','金额','执行时间','医嘱','给药方式'
             ,'频率','剂量','单位','医生','生日','性别','身份','诊断','科室','病室','是否婴儿','请领人','长期标志','药品类型','给药方式编码','医嘱号',
-            '自费标志','单列','贵重','毒麻','审批标志','药房编码','规格','医生编码','药单类别','药品编码','口服开始时间','口服结束时间','帐页号','流水号'],
+            '自费标志','单列','贵重','毒麻','审批标志','药房编码','规格','医生编码','药单类别','药品编码','口服开始时间','口服结束时间','帐页号','流水号','医保编码'],
         colModel: [
             {name: 'fybz', index: 'fybz',align:'center',width:30,editable:true,formatter : "select",hidden:pageClass=='T'?true:false,
                 edittype:"select",editoptions:{value : "0:发药;1:暂缓;2:拒发"},
@@ -558,7 +562,11 @@ function initDetailTable() {
             {name: 'kssj', index: 'kssj',align:'center',width:40,hidden:true},
             {name: 'jssj', index: 'jssj',align:'center',width:40,hidden:true},
             {name: 'ledgerSn', index: 'ledgerSn',align:'center',width:40,hidden:true},
-            {name: 'detailSn', index: 'detailSn',align:'center',width:40,hidden:true}
+            {name: 'detailSn', index: 'detailSn',align:'center',width:40,hidden:true},
+            {name: 'nationalCode', index: 'nationalCode',align:'left',width:60,
+                formatter:function(cellvalue, options, rowObject){
+                    return cellvalue == null ? "-" : cellvalue;
+                }}
         ],
         jsonReader: {
             root: "data", repeatitems: false