Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

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

@@ -236,15 +236,15 @@ public class YfWardPrescriptionController {
 
 
     /**
-     * 查询口服摆药单打印数据
+     * 查询口服单打印数据
      *  @param pageNo 药单编码
      * @param pageClass 药单类型编码
      * @param submitFlag 药单状态
      * @return
      */
     @UserLoginToken
-    @RequestMapping(value = "/getBydPrintData", method = {RequestMethod.GET})
-    public Map<String, Object> getBydPrintData(@RequestParam String pageNo,@RequestParam String pageClass,@RequestParam Integer submitFlag) {
+    @RequestMapping(value = "/getOralPrintData", method = {RequestMethod.GET})
+    public Map<String, Object> getOralPrintData(@RequestParam String pageNo,@RequestParam String pageClass,@RequestParam Integer submitFlag) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             String[] pageNos = pageNo.split("/");
@@ -254,7 +254,9 @@ public class YfWardPrescriptionController {
                 return resultMap;
             }
             List<YfWardVo> yfWardVos = yfWardPrescriptionService.getDetail(pageNo,pageClass,submitFlag);
-            List<YfWardVo> results = new ArrayList<>();
+            Map<String,List<YfWardVo>> results = new HashMap<>();
+            List<YfWardVo> byjList = new ArrayList<>();
+            List<YfWardVo> list = new ArrayList<>();
             //病人单个药品统计
             Map<String, Double> countMap = yfWardVos.stream().collect(Collectors.groupingBy(yfWardVo -> yfWardVo.getInpatientNo()
                     + "_" + yfWardVo.getChargeCode()+ "_" + yfWardVo.getSerial(), Collectors.summingDouble(YfWardVo::getAmount)));
@@ -298,8 +300,14 @@ public class YfWardPrescriptionController {
                 yfWardVo.setKssj(kssj);
                 yfWardVo.setJssj(jssj);
                 yfWardVo.setPerformanceTime(yfWardVo.getPerformanceTime());
-                results.add(yfWardVo);
+                if(yfWardVo.getByjFlag() == 0){
+                    list.add(yfWardVo);
+                }else{
+                    byjList.add(yfWardVo);
+                }
             }
+            results.put("byjList",byjList);
+            results.put("list",list);
             resultMap.put("code", 0);
             resultMap.put("message", "查询病房请领单药品明细信息成功");
             resultMap.put("data", results);

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzActOrderMapper.java

@@ -141,6 +141,6 @@ public interface YzActOrderMapper {
             "drug_weight =isnull(drug_weight,0)," +
             "drug_weight_unit =isnull(drug_weight_unit,'')," +
             "drug_vol_unit =isnull(drug_vol_unit,'')," +
-            "drug_vol =isnull(drug_volume,0),mini_unit,start_time,order_name,performance_time from yz_act_order WITH(NOLOCK) where act_order_no=#{actOrderNo}")
+            "drug_volume =isnull(drug_volume,0),mini_unit,start_time,order_name,performance_time from yz_act_order WITH(NOLOCK) where act_order_no=#{actOrderNo}")
     YzActOrder selectYzActOrderByActOrderNo(@Param("actOrderNo") double actOrderNo);
 }

src/main/java/cn/hnthyy/thmz/mapper/his/yz/YzYpZyOrderMapper.java

@@ -118,6 +118,7 @@ public interface YzYpZyOrderMapper {
                     "       group_no=a.group_no, " +
                     "       status_flag=a.status_flag, " +
                     "       doctor_name=a.doctor_name, " +
+                    "       page_class=a.page_class, " +
                     "       drug_class=a.drug_class " +
                     " FROM yz_yp_zy_order a WITH(NOLOCK)" +
                     " where    a.page_no =#{pageNo}  and " +

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

@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -261,9 +262,10 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                         break;
                     case "5":
                         supplyCode = "b";
-                        savePrescription(ypZyPatients);
                         break;
                     case "6":
+                        supplyCode = "q";
+                        break;
                     case "7":
                     case "8":
                     case "9":
@@ -299,6 +301,9 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                     }
                 }
             }
+            if (yzYpZyOrders.get(0).getPageClass().equals("5") || yzYpZyOrders.get(0).getPageClass().equals("6")){
+                savePrescription(ypZyPatients);
+            }
             if(i == count){
                 yzYpPageNoMapper.updateYzYpPageNo(yzYpZyOrders.get(0).getPageNo(), 3);
             }
@@ -314,6 +319,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
      * @return
      */
     public void savePrescription(List<YpZyPatient> ypZyPatients) {
+        int seqNo = 0;
         for (int i = 0; i < ypZyPatients.size(); i++) {
             Prescription prescription = new Prescription();
             YpZyPatient ypZyPatient = ypZyPatients.get(i);
@@ -325,7 +331,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                     String confirmTime = smf.format(ypZyPatient.getConfirmTime());
                     prescription.setPrescriptionNo(confirmTime.split(" ")[0].replace("-","")+
                             confirmTime.split(" ")[1].replace(":","").replace(".",""));
-                    prescription.setSeqNo(i+1);
+                    prescription.setSeqNo(seqNo++);
                     prescription.setPatientId(ypZyPatient.getInpatientNo());
                     prescription.setWardCd(ypZyPatient.getDeptCode());
                     prescription.setBedNo(ypZyPatient.getBedNo());
@@ -364,10 +370,9 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                     APatientMi aPatientMi = aPatientMiMapper.selectPatientMiByInPatientNo(ypZyPatient.getInpatientNo());
                     prescription.setPatientName(aPatientMi.getName());
                     prescription.setBirthday(aPatientMi.getBirthDate());
-                    prescription.setSex(aPatientMi.getSex());
+                    prescription.setSex(aPatientMi.getSex()); prescriptionMapper.insertPrescription(prescription);
                 }
             }
-            prescriptionMapper.insertPrescription(prescription);
         }
     }
 
@@ -416,6 +421,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
             YpZdDict ypZdDict = ypZdDictMapper.selectYpZdDictByCodeAndSerial(yfWardVo.getChargeCode(), yfWardVo.getSerial());
             String manufactory = ypZdManufactoryMapper.selectYpZdManufactoryByCode(ypZdDict.getManuCode());
             yfWardVo.setDrugName(ypZdDict.getName());
+            yfWardVo.setByjFlag(ypZdDict.getByjFlag());
             yfWardVo.setSpecification(ypZdDict.getSpecification());
             yfWardVo.setManufactory(manufactory);
             yfWardVo.setPageClass(pageClass);
@@ -436,15 +442,20 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
         for (int i = 0; i < yfWardVos.size(); i++) {
             YfWardVo yfWardVo = yfWardVos.get(i);
             YpZdDict ypZdDict = ypZdDictMapper.selectYpZdDictByCodeAndSerial(yfWardVo.getChargeCode(), yfWardVo.getSerial());
-            if(ypZdDict.getByjFlag() == 0){
+            if(((yfWardVo.getPageClass().equals("5")||yfWardVo.getPageClass().equals("6")) && ypZdDict.getByjFlag() == 0)
+                    || ((!yfWardVo.getPageClass().equals("5")&&!yfWardVo.getPageClass().equals("6")) && "d".equals(yfWardVo.getDrugClass()))){
                 YzActOrder yzActOrder = yzActOrderMapper.selectYzActOrderByActOrderNo(yfWardVo.getActOrderNo());
                 yfWardVo.setDose(yzActOrder.getDose());
-                yfWardVo.setDoseUnit(mzPharmacyMapper.selectYpUnitName(yzActOrder.getDoseUnit()));
-                float dosage = 0;
-                if(yzActOrder.getDoseUnit() == yzActOrder.getDrugVolUnit()){
-                    dosage = yzActOrder.getDrugVolume()/yzActOrder.getDose();
+                String ypUnitName = mzPharmacyMapper.selectYpUnitName(yzActOrder.getDoseUnit());
+                yfWardVo.setDoseUnit(ypUnitName);
+                String dosage;
+                if(yzActOrder.getDoseUnit().equals(yzActOrder.getDrugVolUnit())){
+                    dosage = yzActOrder.getDose()/yzActOrder.getDrugVolume()+"";
                 }else{
-                    dosage = yzActOrder.getDrugWeight()/yzActOrder.getDose();
+                    dosage = yzActOrder.getDose()/yzActOrder.getDrugWeight()+"";
+                }
+                if(Double.parseDouble(dosage) < 1){
+                    dosage = NumberFormat.getInstance().format(yfWardVo.getDose())+ypUnitName;
                 }
                 yfWardVo.setDosage(dosage);
                 APatientMi aPatientMi = aPatientMiMapper.selectPatientMiByInPatientNo(yfWardVo.getInpatientNo());

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

@@ -197,5 +197,7 @@ public class YfWardVo {
     //结束时间
     private String jssj;
     //服量
-    private Float dosage;
+    private String dosage;
+    //是否摆药机操作 1：是 0：否
+    private Integer byjFlag;
 }

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

@@ -53,28 +53,72 @@ function initButtonChange(object, realIndex) {
             $(element).removeClass("btn-primary").addClass("btn-default");
         }
     });
+    $(object).removeClass("btn-default").addClass("btn-primary");
+
     if (realIndex == 0) {
-        $("#tb_table_div").css("display", "");
-        $("#tb_detailed_table_div").css("display", "none");
         cleanParams();
         initTbTable();
     } else if(realIndex == 1){
-        initDetailedHtml();
-        initDetailedTbTable();
-        loadDetailedTbTable(pageNo,pageClass,wardCode,hzFlag);
-    }else{
-        $("#tb_table_div").css("display", "none");
-        $("#tb_detailed_table_div").css("display", "none");
+        setFrom();
+        loadSummarizingTable(pageNo,pageClass,wardCode,hzFlag);
+    }else if(realIndex == 2){
+        setFrom();
+        loadDetailTable();
     }
-    $(object).removeClass("btn-default").addClass("btn-primary");
 }
 
+function setFrom() {
+    $("#wardCode").selectpicker('val',wardCode);
+    if(hzFlag == 0){
+        $("#pageNoSearch").val(pageNo)
+    }
+    $("#pageClassSearch").val(pageClass);
+    $("#wardCode").selectpicker('refresh');
+    $("#pageClassSearch").selectpicker('refresh');
+}
+
+/**
+ * 控制汇总和明细的显示
+ */
+function detail(no,type,code,flag) {
+    pageNo = no;
+    pageClass = type;
+    wardCode = code;
+    hzFlag = flag;
+    setFrom();
+    switch (type) {
+        case "2":
+        case "5":
+        case "6":
+            initButtonChange("#mx",2);
+            break;
+        default:
+            initButtonChange("#hz",1);
+    }
+}
+/**
+ * 药单界面显示
+ */
+function initHtml() {
+    $("#tb_table_div").css("display", "");
+    $("#tb_summarizing_table_div").css("display", "none");
+    $("#tb_detail_table_div").css("display", "none");
+}
+/**
+ * 药单汇总界面显示
+ */
+function initSummarizingHtml() {
+    $("#tb_summarizing_table_div").css("display", "");
+    $("#tb_table_div").css("display", "none");
+    $("#tb_detail_table_div").css("display", "none");
+}
 /**
  * 药单详细界面初始化
  */
-function initDetailedHtml() {
+function initDetailHtml() {
     $("#tb_table_div").css("display", "none");
-    $("#tb_detailed_table_div").css("display", "");
+    $("#tb_summarizing_table_div").css("display", "none");
+    $("#tb_detail_table_div").css("display", "");
 }
 
 
@@ -83,8 +127,8 @@ function initDetailedHtml() {
  */
 function initTbTable() {
     let pageIndex = $('#tb_table').bootstrapTable('getOptions').pageNumber;
-    if($("#tb_table_div").css("display") == 'block'){
-        console.log(1);
+    if($('#qld').hasClass('btn-primary')){
+        initHtml();
         $('#tb_table').bootstrapTable("destroy");
         $('#tb_table').bootstrapTable({
             url: "/thmz/getYzYpPageNo",         //请求后台的URL（*）
@@ -97,7 +141,7 @@ function initTbTable() {
             queryParams: queryParams,           //传递参数（*）
             sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
             pageNumber: pageIndex || 1,                       //初始化加载第一页，默认第一页
-            pageSize: 15,                       //每页的记录行数（*）
+            pageSize: 30,                       //每页的记录行数（*）
             pageList: [25, 50, 100],        //可供选择的每页的行数（*）
             search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
             strictSearch: true,
@@ -121,9 +165,9 @@ function initTbTable() {
                     align: "center",
                     valign: 'middle',
                     formatter: function (value, row, index) {
-                        var str = '<button type="button" class="registration-no-color-foot-button" title="药单详细" onclick="loadDetailedTbTable(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',0)"><i class="fa fa-plus"></i></button>';
+                        var str = '<button type="button" class="registration-no-color-foot-button" title="药单详细" onclick="detail(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',0)"><i class="fa fa-plus"></i></button>';
                         if($("#submitFlagSearch").val() == 1 && row.pageClass!='T'  && row.pageClass!='A'){
-                            str += '<button type="button" class="registration-no-color-foot-button" title="病室药单汇总" onclick="loadDetailedTbTable(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',1)"><i class="fa fa-compress"></i></button>';
+                            str += '<button type="button" class="registration-no-color-foot-button" title="病室药单汇总" onclick="detail(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',1)"><i class="fa fa-compress"></i></button>';
                         }
                         return str;
                     }
@@ -200,12 +244,12 @@ function initTbTable() {
             ],
             rowStyle: function(row, index) {
                 if( row.pageClass == "T"){
-                    return {css:{'color':'red'}};
+                    return {css:{'color':'red','padding': '0px'}};
                 }
-                return '';
+                return {css:{'padding': '0px'}};
             },
             onDblClickRow: function (row) {
-                loadDetailedTbTable(row.pageNo,row.pageClass,row.wardCode,0);
+                loadSummarizingTable(row.pageNo,row.pageClass,row.wardCode,0);
             },
             responseHandler: function (res) {
                 if (res == '401' || res == 401) {
@@ -237,15 +281,11 @@ function initTbTable() {
     }
 }
 /**
- * 加载药单详细信息表格
+ * 加载药单汇总信息表格
  */
-function loadDetailedTbTable(no,type,code,flag) {
-    pageNo = no;
-    pageClass = type;
-    wardCode = code;
-    hzFlag = flag;
-    initDetailedHtml();
-    initDetailedTbTable();
+function loadSummarizingTable() {
+    initSummarizingHtml();
+    initSummarizingTable();
     let url = '/thmz/getZyDrugCount';
     let tem={
         groupNo: groupNo,
@@ -253,7 +293,7 @@ function loadDetailedTbTable(no,type,code,flag) {
         submitFlag: $("#submitFlagSearch").val()
     };
     if(hzFlag == 1){
-        tem.wardCode=code;
+        tem.wardCode=wardCode;
         $.ajax({
             type: "GET",
             url: '/thmz/queryYzYpPageNoStr',
@@ -265,7 +305,7 @@ function loadDetailedTbTable(no,type,code,flag) {
                 if (res.code == 0) {
                     url = '/thmz/getYzYpOrderWard';
                     pageNos = res.data;
-                    $("#tb_detailed_table").jqGrid('setGridParam',{
+                    $("#tb_summarizing_table").jqGrid('setGridParam',{
                         datatype:'json',
                         url: url,
                         postData: tem,
@@ -282,7 +322,7 @@ function loadDetailedTbTable(no,type,code,flag) {
         });
     }else{
         tem.pageNo=pageNo;
-        $("#tb_detailed_table").jqGrid('setGridParam',{
+        $("#tb_summarizing_table").jqGrid('setGridParam',{
             datatype:'json',
             url: url,
             postData: tem
@@ -290,13 +330,24 @@ function loadDetailedTbTable(no,type,code,flag) {
     }
 }
 
+/**
+ * 加载药单汇总信息表格
+ */
+function loadDetailTable() {
+    initDetailHtml();
+    initDetailTable();
+    $("#tb_detail_table").jqGrid('setGridParam',{
+        datatype:'json'
+    }).trigger('reloadGrid');
+}
+
 
 /**
- * 初始化药单详细信息表格
+ * 初始化药单汇总信息表格
  */
-function initDetailedTbTable() {
-    $.jgrid.gridUnload("tb_detailed_table");
-    $("#tb_detailed_table").jqGrid({
+function initSummarizingTable() {
+    $.jgrid.gridUnload("tb_summarizing_table");
+    $("#tb_summarizing_table").jqGrid({
         datatype: 'local',
         mtype: 'get',
         loadBeforeSend: function (jqXHR) {
@@ -330,7 +381,7 @@ function initDetailedTbTable() {
             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:拒发"},
@@ -363,20 +414,21 @@ function initDetailedTbTable() {
                 }},
             {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},
         ],
         jsonReader: {
             root: "data", repeatitems: false
         },
         afterSaveCell: function(rowid,celname,value,iRow,iCol) {
-            let data = $("#tb_detailed_table").getRowData(rowid);
-            $("#tb_detailed_table").setCell(rowid, iCol, value);
+            let data = $("#tb_summarizing_table").getRowData(rowid);
+            $("#tb_summarizing_table").setCell(rowid, iCol, value);
             if(value==null || value==0){
                 //重置
-                $("#tb_detailed_table").setCell(rowid, "amount", data.oldAmount);
-                $("#tb_detailed_table").setCell(rowid, "totalMoney", keepTwoDecimal(data.retprice*data.oldAmount));
+                $("#tb_summarizing_table").setCell(rowid, "amount", data.oldAmount);
+                $("#tb_summarizing_table").setCell(rowid, "totalMoney", keepTwoDecimal(data.retprice*data.oldAmount));
             }else{
-                $("#tb_detailed_table").setCell(rowid, "amount", 0);
-                $("#tb_detailed_table").setCell(rowid, "totalMoney", 0);
+                $("#tb_summarizing_table").setCell(rowid, "amount", 0);
+                $("#tb_summarizing_table").setCell(rowid, "totalMoney", 0);
             }
             return true
         },
@@ -387,90 +439,23 @@ function initDetailedTbTable() {
             }
             if (res.code == -1) {
                 errorMesage(res);
-            }else if(res.data!=null && res.data.length>0){
-                $("#wardCode").selectpicker('val',wardCode);
-                if(hzFlag == 0){
-                    $("#pageNoSearch").val(pageNo)
-                }
-                $("#pageClassSearch").val(res.data[0].pageClass);
-                $("#wardCode").selectpicker('refresh');
-                $("#pageClassSearch").selectpicker('refresh');
             }
-            $("#initButton").find("button").each(function (index, element) {
-                if ($(element).hasClass("btn-primary")) {
-                    $(element).removeClass("btn-primary").addClass("btn-default");
-                }
-            });
-            $("#xx").removeClass("btn-default").addClass("btn-primary");
         }
     });
-    $("#t_tb_detailed_table").append("<button class='registration-no-color-foot-button' title='药单明细' onclick='prescriptionDetail()' style='margin-left: 10px;'><i class='fa fa-list'></i></button>");
-    $("#t_tb_detailed_table").append("<button class='registration-no-color-foot-button' title='打印汇总药单' onclick='printCount()' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
-    $("#t_tb_detailed_table").append("<button class='registration-no-color-foot-button' title='打印口服标签' onclick='printLabelData()' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
+    $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='打印汇总药单' onclick='printCount()' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
+    $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='打印口服标签' onclick='printLabelData(0)' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
     if($("#submitFlagSearch").val() == 1){
-        $("#t_tb_detailed_table").append("<button class='registration-no-color-foot-button' title='保存' id='collect_save' onclick='save(0)' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
-    }
-}
-
-
-/**
- * 获取时间选择器的时间数组
- * @returns {string[]}
- */
-function getRePortRangeArr() {
-    var rePortRange = $('#reportrange span').html();
-    var rePortRangeArr = rePortRange.split(" - ");
-    rePortRangeArr[0] = rePortRangeArr[0] + " 00:00:00"
-    rePortRangeArr[1] = rePortRangeArr[1] + " 23:59:59"
-    return rePortRangeArr;
-}
-
-/**
- * 构建列表查询参数
- * @param params
- */
-function queryParams(params) {
-    var rePortRangeArr = getRePortRangeArr();
-    let wardCode;
-    if($("#wardCode").val() == null){
-        wardCode = null;
-    }else{
-        wardCode = $("#wardCode").val()[0]
+        $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='保存' id='collect_save' onclick='save(0)' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
     }
-    var temp = {
-        submitBeginDate: rePortRangeArr[0],
-        submitEndDate: rePortRangeArr[1],
-        wardCode: wardCode,
-        pageNo: $("#pageNoSearch").val() == "" ? null : $("#pageNoSearch").val(),
-        pageClass: $("#pageClassSearch").val() == "" ? null : $("#pageClassSearch").val(),
-        groupNo: groupNo,
-        submitFlag: $("#submitFlagSearch").val()
-    };
-    return temp;
-};
-
-/**
- * 清空查询条件
- */
-function cleanParams() {
-    //$('#reportrange span').html(moment().subtract(10, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
-    $("#pageNoSearch").val(null);
-    $("#pageClassSearch").val(null);
-    $("#pageClassSearch").selectpicker('refresh');
-    $("#wardCode").selectpicker('val','');
-    $("#wardCode").selectpicker('refresh');
-    $("#submitFlagSearch").val(1);
-    $("#submitFlagSearch").selectpicker('refresh');
 }
 
-
 /**
- * 查询请领单明细
+ * 初始化药单详细信息表格
  */
-function prescriptionDetail() {
-    $.jgrid.gridUnload("tb_prescription_table");
-    $("#tb_prescription_table").jqGrid({
-        datatype: 'json',
+function initDetailTable() {
+    $.jgrid.gridUnload("tb_detail_table");
+    $("#tb_detail_table").jqGrid({
+        datatype: 'local',
         mtype: 'get',
         url: '/thmz/getZyDrugDetail',
         loadBeforeSend: function (jqXHR) {
@@ -563,15 +548,15 @@ function prescriptionDetail() {
             root: "data", repeatitems: false
         },
         afterSaveCell: function(rowid,celname,value,iRow,iCol) {
-            let data = $("#tb_prescription_table").getRowData(rowid);
-            $("#tb_prescription_table").setCell(rowid, iCol, value);
+            let data = $("#tb_detail_table").getRowData(rowid);
+            $("#tb_detail_table").setCell(rowid, iCol, value);
             if(value==null || value==0){
                 //重置
-                $("#tb_prescription_table").setCell(rowid, "amount", data.oldAmount);
-                $("#tb_prescription_table").setCell(rowid, "totalMoney", keepTwoDecimal(data.retprice*data.oldAmount));
+                $("#tb_detail_table").setCell(rowid, "amount", data.oldAmount);
+                $("#tb_detail_table").setCell(rowid, "totalMoney", keepTwoDecimal(data.retprice*data.oldAmount));
             }else{
-                $("#tb_prescription_table").setCell(rowid, "amount", 0);
-                $("#tb_prescription_table").setCell(rowid, "totalMoney", 0);
+                $("#tb_detail_table").setCell(rowid, "amount", 0);
+                $("#tb_detail_table").setCell(rowid, "totalMoney", 0);
             }
             return true
         },
@@ -585,15 +570,62 @@ function prescriptionDetail() {
             }
         }
     });
-    $("#prescriptionModal").modal();
-    $("#t_tb_prescription_table").append("<button class='registration-no-color-foot-button' title='打印药单明细' onclick='getPrintDetail()' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
-    if(pageClass == 5 || pageClass == 6){
-        $("#t_tb_prescription_table").append("<button class='registration-no-color-foot-button' title='打印口服标签' onclick='printLabelData()' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
-    }
+    $("#t_tb_detail_table").append("<button class='registration-no-color-foot-button' title='打印药单明细' onclick='getPrintDetail()' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
+    $("#t_tb_detail_table").append("<button class='registration-no-color-foot-button' title='打印口服标签' onclick='printLabelData(1)' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
     if($("#submitFlagSearch").val() == 1){
-        $("#t_tb_prescription_table").append("<button class='registration-no-color-foot-button' title='保存' id='detail_save' onclick='save(1)' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
+        $("#t_tb_detail_table").append("<button class='registration-no-color-foot-button' title='保存' id='detail_save' onclick='save(1)' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
+    }
+}
+
+
+/**
+ * 获取时间选择器的时间数组
+ * @returns {string[]}
+ */
+function getRePortRangeArr() {
+    var rePortRange = $('#reportrange span').html();
+    var rePortRangeArr = rePortRange.split(" - ");
+    rePortRangeArr[0] = rePortRangeArr[0] + " 00:00:00"
+    rePortRangeArr[1] = rePortRangeArr[1] + " 23:59:59"
+    return rePortRangeArr;
+}
+
+/**
+ * 构建列表查询参数
+ * @param params
+ */
+function queryParams(params) {
+    var rePortRangeArr = getRePortRangeArr();
+    let wardCode;
+    if($("#wardCode").val() == null){
+        wardCode = null;
+    }else{
+        wardCode = $("#wardCode").val()[0]
     }
-    $("#tb_prescription_table").jqGrid("setGridWidth", 1160);
+    var temp = {
+        submitBeginDate: rePortRangeArr[0],
+        submitEndDate: rePortRangeArr[1],
+        wardCode: wardCode,
+        pageNo: $("#pageNoSearch").val() == "" ? null : $("#pageNoSearch").val(),
+        pageClass: $("#pageClassSearch").val() == "" ? null : $("#pageClassSearch").val(),
+        groupNo: groupNo,
+        submitFlag: $("#submitFlagSearch").val()
+    };
+    return temp;
+};
+
+/**
+ * 清空查询条件
+ */
+function cleanParams() {
+    //$('#reportrange span').html(moment().subtract(10, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
+    $("#pageNoSearch").val(null);
+    $("#pageClassSearch").val(null);
+    $("#pageClassSearch").selectpicker('refresh');
+    $("#wardCode").selectpicker('val','');
+    $("#wardCode").selectpicker('refresh');
+    $("#submitFlagSearch").val(1);
+    $("#submitFlagSearch").selectpicker('refresh');
 }
 
 
@@ -609,7 +641,7 @@ function printCount() {
     $(".pageNo").text($("#pageNoSearch").val()==''?pageNos:$("#pageNoSearch").val());
     $(".printDate").html(format(new Date(),"yyyy-MM-dd HH:mm"));
     $('.sjh').remove();
-    let datas = getJQAllData("tb_detailed_table");
+    let datas = getJQAllData("tb_summarizing_table");
     console.log(datas);
     for (var i = 0; i < datas.length; i++) {
         let data = datas[i];
@@ -652,11 +684,11 @@ function printCount() {
  * 打印明细单
  */
 function getPrintDetail() {
-    let datas = getJQAllData("tb_prescription_table");
-    if(pageClass=="5"){
+    let datas = getJQAllData("tb_detail_table");
+    if(pageClass=="5" || pageClass=="6"){
         $.ajax({
             type: "GET",
-            url: '/thmz/getBydPrintData',
+            url: '/thmz/getOralPrintData',
             contentType: "application/json;charset=UTF-8",
             dataType: "json",
             headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -671,8 +703,8 @@ function getPrintDetail() {
                     return;
                 }
                 if (res.code == 0) {
-                    for (let i = 0; i < res.data.length; i++) {
-                        let byjDate = res.data[i];
+                    for (let i = 0; i < res.data.list.length; i++) {
+                        let byjDate = res.data.list[i];
                         byjDate["oldAmount"] = byjDate["amount"];
                         for (let j = 0; j < datas.length; j++) {
                             let data = datas[j];
@@ -683,24 +715,58 @@ function getPrintDetail() {
                             }
                         } 
                     }
-                    printDetail(res.data)
+                    for (let i = 0; i < res.data.byjList.length; i++) {
+                        let byjDate = res.data.byjList[i];
+                        byjDate["oldAmount"] = byjDate["amount"];
+                        for (let j = 0; j < datas.length; j++) {
+                            let data = datas[j];
+                            //发药数量为0，删减汇总数量
+                            if(data["amount"] == 0 && byjDate["inpatientNo"] == data["inpatientNo"]
+                                && byjDate["chargeCode"] == data["chargeCode"] && byjDate["serial"] == data["serial"]){
+                                byjDate["amount"] -= parseFloat(data["oldAmount"])
+                            }
+                        }
+                    }
+                    printDetail(res.data,1)
                 } else {
                     errorMesage(res);
                 }
             }
         });
     }else {
-        printDetail(datas);
+        printDetail(datas,0);
+    }
+}
+
+function printDetail(datas,kfFlag) {
+    if(kfFlag == 1){
+        if(datas.list.length > 0){
+            printDetailHtml(datas.list);
+        }
+        if(datas.byjList.length > 0){
+            printDetailHtml(datas.byjList);
+        }
+    }else{
+        printDetailHtml(datas);
     }
+
 }
 
-function printDetail(datas) {
+/**
+ *
+ */
+function printDetailHtml(datas) {
     let html = '';
     let totalMoney = 0;
     let oldInpatientNo = '';//记录上一个病人
     let title = '病房明细领药单('+$("#pageClassSearch").find("option:selected").text()+')';
     if(pageClass == '5'){
-        title = '长期口服摆药单'
+        title = '长期口服领药单'
+    }else if(pageClass == '6'){
+        title = '临时口服领药单'
+    }
+    if(datas[0].byjFlag == 1){
+        title += '(摆药机)'
     }
     $(".title").text(title);
     $(".groupName").text(groupNo==71?'门诊西药房':'住院药房');
@@ -708,90 +774,92 @@ function printDetail(datas) {
     $(".pageNo").text($("#pageNoSearch").val()==''?pageNos:$("#pageNoSearch").val());
     $(".printDate").html(format(new Date(),"yyyy-MM-dd HH:mm"));
     $('.sjh').remove();
+    let minOccTime = '';
     for (var i = 0; i < datas.length; i++) {
-         let data = datas[i];
-         if(pageClass!="A" && pageClass!="5" && (oldInpatientNo=='' || oldInpatientNo!=data.inpatientNo)){//临时口服，统领单
-             html += '<tr class="sjh">';
-             html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">年龄：' + getBirthSlot(data.birthDate,new Date()) + '</td>';
-             html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">性别：' + getSex(data.sex) + '</td>';
-             html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">身份：' + data.responceName + '</td>';
-             html += '<td colspan="7" class="xtd" style="text-align: left;border: transparent !important;">诊断：' + data.admissDiagStr + '</td>';
-             html += '</tr>';
-         }
-         oldInpatientNo = data.inpatientNo;
-         html += '<tr class="sjh">';
-         if(pageClass=="5"){
-             $(".zyh").hide();
-         }else{
-             $(".zyh").show();
-             html += '<td class="xtd" style="text-align: center;">' + data.inpatientNo + '</td>';
-         }
-         html += '<td class="xtd" style="text-align: center;">' + data.name + '</td>';
-         html += '<td class="xtd" style="text-align: center;">' + data.bedNo + '</td>';
-         html += '<td class="xtd" style="text-align: left;">' + data.drugName + '</td>';
-         html += '<td class="xtd" style="text-align: center;">' + data.specification + '</td>';
-         html += '<td class="xtd" style="text-align: center;">' + data.oldAmount + '</td>';
-         html += '<td class="xtd" style="text-align: center;">' + data.amount + '</td>';
-         if(pageClass=="A"){//医技
-             $(".yjmxtd").show();
-             $(".kfmxtd").hide();
-             $(".kssj").hide();
-             $(".jssj").hide();
-             html += '<td class="xtd" style="text-align: center;">' + data.retprice + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.totalMoney + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.occTime + '</td>';
-         }else if(pageClass=="5"){//长期口服
-             $(".kfmxtd").show();
-             $(".yjmxtd").hide();
-             $(".gyfs").hide();
-             $(".kssj").show();
-             $(".jssj").show();
-             var arr1 = datas[0].occTime.split(" ");
-             var sdate = arr1[0].split('-');
-             var kssj = new Date(sdate[0], sdate[1]-1, sdate[2]);
-             $(".kssj").text(format(kssj, "yy/MM/dd"));
-             kssj.setTime(kssj.getTime()+24*60*60*1000);
-             $(".jssj").text(format(kssj, "yy/MM/dd"));
-             html += '<td class="xtd" style="text-align: center;">' + data.frequCode + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.dose + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.doseUnit + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.instruction + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.kssj + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.jssj + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.doctorNameStr + '</td>';
-         }else{
-             $(".kfmxtd").show();
-             $(".yjmxtd").hide();
-             $(".kssj").hide();
-             $(".jssj").hide();
-             html += '<td class="xtd" style="text-align: center;">' + data.frequCode + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.dose + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.doseUnit + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.instruction + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.supplyName + '</td>';
-             html += '<td class="xtd" style="text-align: center;">' + data.doctorNameStr + '</td>';
-         }
-         html += '</tr>';
-         totalMoney+=parseFloat(data.totalMoney);
-     }
-     html += '<tr class="sjh"><td colspan="13" style="border: transparent !important;">&nbsp</td></tr>';
-     html += '<tr class="sjh">';
-     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">调配人：<br><br>时间：</td>';
-     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">核发人：<br><br>时间：</td>';
-     html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">领药人：<br><br>时间：</td>';
-     html += '<td colspan="4" style="text-align: left;font-weight: 700;border: transparent !important;">护士：<br><br>时间：</td>';
-     html += '</tr>';
-     $("#mxdy_table").append(html);
-     print("mxdy_table_div");
+        let data = datas[i];
+        if(pageClass!="A" && pageClass!="5" && (oldInpatientNo=='' || oldInpatientNo!=data.inpatientNo)){//临时口服，统领单
+            html += '<tr class="sjh">';
+            html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">年龄：' + getBirthSlot(data.birthDate,new Date()) + '</td>';
+            html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">性别：' + getSex(data.sex) + '</td>';
+            html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">身份：' + data.responceName + '</td>';
+            html += '<td colspan="7" class="xtd" style="text-align: left;border: transparent !important;">诊断：' + data.admissDiagStr + '</td>';
+            html += '</tr>';
+        }
+        oldInpatientNo = data.inpatientNo;
+        html += '<tr class="sjh">';
+        if(pageClass=="5"){
+            $(".zyh").hide();
+        }else{
+            $(".zyh").show();
+            html += '<td class="xtd" style="text-align: center;">' + data.inpatientNo + '</td>';
+        }
+        html += '<td class="xtd" style="text-align: center;">' + data.name + '</td>';
+        html += '<td class="xtd" style="text-align: center;">' + data.bedNo + '</td>';
+        html += '<td class="xtd" style="text-align: left;">' + data.drugName + '</td>';
+        html += '<td class="xtd" style="text-align: center;">' + data.specification + '</td>';
+        html += '<td class="xtd" style="text-align: center;">' + data.oldAmount + '</td>';
+        html += '<td class="xtd" style="text-align: center;">' + data.amount + '</td>';
+        if(pageClass=="A"){//医技
+            $(".yjmxtd").show();
+            $(".kfmxtd").hide();
+            $(".kssj").hide();
+            $(".jssj").hide();
+            html += '<td class="xtd" style="text-align: center;">' + data.retprice + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.totalMoney + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.occTime + '</td>';
+        }else if(pageClass=="5" || pageClass=="6"){//口服单
+            $(".kfmxtd").show();
+            $(".yjmxtd").hide();
+            $(".gyfs").hide();
+            if(minOccTime == '' || minOccTime > data.occTime){
+                minOccTime = data.occTime
+            }
+            html += '<td class="xtd" style="text-align: center;">' + data.frequCode + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.dose + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.doseUnit + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.instruction + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.kssj + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.jssj + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.doctorNameStr + '</td>';
+        }else{
+            $(".kfmxtd").show();
+            $(".yjmxtd").hide();
+            $(".kssj").hide();
+            $(".jssj").hide();
+            html += '<td class="xtd" style="text-align: center;">' + data.frequCode + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.dose + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.doseUnit + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.instruction + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.supplyName + '</td>';
+            html += '<td class="xtd" style="text-align: center;">' + data.doctorNameStr + '</td>';
+        }
+        html += '</tr>';
+        totalMoney+=parseFloat(data.totalMoney);
+    }
+    if(pageClass=="5" || pageClass=="6"){//口服单
+        $(".kssj").show();
+        $(".jssj").show();
+        var arr1 = minOccTime.split(" ");
+        var sdate = arr1[0].split('-');
+        var kssj = new Date(sdate[0], sdate[1]-1, sdate[2]);
+        $(".kssj").text(format(kssj, "yy/MM/dd"));
+        kssj.setTime(kssj.getTime()+24*60*60*1000);
+        $(".jssj").text(format(kssj, "yy/MM/dd"));
+    }
+    html += '<tr class="sjh"><td colspan="13" style="border: transparent !important;">&nbsp</td></tr>';
+    html += '<tr class="sjh">';
+    html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">调配人：<br><br>时间：</td>';
+    html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">核发人：<br><br>时间：</td>';
+    html += '<td colspan="3" style="text-align: left;font-weight: 700;border: transparent !important;">领药人：<br><br>时间：</td>';
+    html += '<td colspan="4" style="text-align: left;font-weight: 700;border: transparent !important;">护士：<br><br>时间：</td>';
+    html += '</tr>';
+    $("#mxdy_table").append(html);
+    print("mxdy_table_div");
 }
 /**
  * 打印标签
  */
-function printLabelData() {
-    /*if(pageClass != "5" && pageClass != "6"){
-        warningMesageSimaple("请选择口服单打印");
-        return
-    }*/
+function printLabelData(flag) {
     $.ajax({
         type: "GET",
         url: '/thmz/getLabelPrintDatas',
@@ -813,7 +881,7 @@ function printLabelData() {
                     return;
                 }
                 console.log(res.data);
-                printLabel(res.data);
+                printLabel(res.data,flag);
                 successMesage(res);
             } else {
                 errorMesage(res);
@@ -825,61 +893,67 @@ function printLabelData() {
 /**
  * 打印标签
  */
-function printLabel(datas) {
+function printLabel(datas,isMx) {
     LODOP = getLodop();
     LODOP.PRINT_INITA(6, 0, "78", "66mm", "住院患者内服袋打印");
     LODOP.SET_PRINT_PAGESIZE(1, "78mm", "66mm","");
-    //设置默认打印机
+    //设置打印机
     LODOP.SET_PRINTER_INDEX(nfdPrintIndex);
     LODOP.SET_PRINT_STYLE("FontSize", 10); //字体大小
     LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
-    //设置默认打印机
-    LODOP.SET_PRINTER_INDEX(defaultPrintIndex);
     LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
     var strStyle="<style>table,td,th {border-width: 1px;" +
         "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 13px}</style>";
     let html = '';
     let flag = true;//新的一张标签
     let number = 0;//计数，一张标签只存放五种药品
+    let tableDatas = getJQAllData(isMx==1?"tb_detail_table":"tb_summarizing_table");
+    $('.sjh').remove();
     for (var i = 0; i < datas.length; i++) {
         let data = datas[i];
-        if((i > 0 && (data.inpatientNo != datas[i-1].inpatientNo
-            || data.occTime != datas[i-1].occTime)) || number == 5){//服药时间或者病人不同另起一页，超过五种药品另起一页
-            for (let j = 0; j < 5-number; j++) {
+        for (let j = 0; j < tableDatas.length; j++) {
+            if(tableDatas[j].fybz.indexOf("发药") != -1 && tableDatas[j].chargeCode == data.chargeCode
+                && tableDatas[j].serial == data.serial && tableDatas[j].occTime == data.occTime){
+                if((i > 0 && (data.inpatientNo != datas[i-1].inpatientNo
+                    || data.occTime != datas[i-1].occTime)) || number == 5){//服药时间或者病人不同另起一页，超过五种药品另起一页
+                    for (let j = 0; j < 5-number; j++) {
+                        html += '<tr class="sjh">';
+                        html += '<td class="xtd">&nbsp;</td>';
+                        html += '<td class="xtd"></td>';
+                        html += '<td class="xtd"></td>';
+                        html += '<td class="xtd"></td>';
+                        html += '<td class="xtd"></td>';
+                        html += '</tr>';
+                    }
+                    $("#bqdy_table").append(html);
+                    LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm",strStyle+ document.getElementById("bqdy_table_div").innerHTML);
+                    LODOP.NewPageA();
+                    flag = true;
+                    html = '';
+                    number = 0;
+                }else if(i != 0){
+                    flag = false;
+                }
+                if(flag){
+                    $('.sjh').remove();
+                    $(".inpatientNo").text($.trim(data.inpatientNo));
+                    $(".bedNo").text($.trim(data.bedNo));
+                    $(".name").text($.trim(data.name));
+                    $(".age").text(getBirthSlot(data.birthDate,new Date()));
+                    $(".sex").text(getSex(data.sex));
+                    $(".occTime").text(format(data.occTime,"yyyy/MM/dd HH:mm"));
+                }
                 html += '<tr class="sjh">';
-                html += '<td class="xtd">&nbsp;</td>';
-                html += '<td class="xtd"></td>';
-                html += '<td class="xtd"></td>';
-                html += '<td class="xtd"></td>';
-                html += '<td class="xtd"></td>';
+                html += '<td class="xtd" style="text-align: left;">' + data.drugName + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data.dose+data.doseUnit + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data.specification + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data.dosage.replace(".0","") + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data.amount + '</td>';
                 html += '</tr>';
+                number++;
+                break;
             }
-            $("#bqdy_table").append(html);
-            LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm",strStyle+ document.getElementById("bqdy_table_div").innerHTML);
-            LODOP.NewPageA();
-            flag = true;
-            html = '';
-            number = 0;
-        }else if(i != 0){
-            flag = false;
-        }
-        if(flag){
-            $('.sjh').remove();
-            $(".inpatientNo").text($.trim(data.inpatientNo));
-            $(".bedNo").text($.trim(data.bedNo));
-            $(".name").text($.trim(data.name));
-            $(".age").text(getBirthSlot(data.birthDate,new Date()));
-            $(".sex").text(getSex(data.sex));
-            $(".occTime").text(format(data.occTime,"yyyy/MM/dd HH:mm"));
         }
-        html += '<tr class="sjh">';
-        html += '<td class="xtd" style="text-align: left;">' + data.drugName + '</td>';
-        html += '<td class="xtd" style="text-align: center;">' + data.dose+data.doseUnit + '</td>';
-        html += '<td class="xtd" style="text-align: center;">' + data.specification + '</td>';
-        html += '<td class="xtd" style="text-align: center;">' + data.dosage + '</td>';
-        html += '<td class="xtd" style="text-align: center;">' + data.amount + '</td>';
-        html += '</tr>';
-        number++;
     }
     for (let j = 0; j < 5-number; j++) {
         html += '<tr class="sjh">';
@@ -905,13 +979,13 @@ function print(div_id) {
     LODOP.SET_PRINT_PAGESIZE(1, "241mm", "93mm","");
     //设置默认打印机
     LODOP.SET_PRINTER_INDEX(defaultPrintIndex);
-    LODOP.SET_PRINT_STYLE("FontSize", 13); //字体大小
+    LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
     LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
     var strStyle="<style>table,td,th {border-width: 1px;" +
-        "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;}</style>";
+        "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 11}</style>";
     LODOP.ADD_PRINT_HTM("0mm", "4mm", "RightMargin:4mm", "BottomMargin:0mm",strStyle+ document.getElementById(div_id).innerHTML);
-    //LODOP.PRINT();
-    LODOP.PREVIEW();
+    LODOP.PRINT();
+    //LODOP.PREVIEW();
 }
 
 /**
@@ -922,7 +996,7 @@ function save(flag){
         return;
     }
     //拿到grid对象
-    var obj = $(flag==0?"#tb_detailed_table":"#tb_prescription_table");
+    var obj = $(flag==0?"#tb_summarizing_table":"#tb_detail_table");
     //获取grid表中所有的rowid值
     var rowIds = obj.getDataIDs();
     //初始化一个数组arrayData容器，用来存放rowData
@@ -934,7 +1008,6 @@ function save(flag){
             }
         }
     }
-    console.log(datas);
     $(flag==0?"#collect_save":"#detail_save").attr('disabled',true);
     $.ajax({
         type: "POST",

src/main/resources/templates/yf/ward_prescription.html

@@ -22,6 +22,10 @@
     .hidden {
         display: none;
     }
+    .table-bordered>tbody>tr>td {
+        padding: 0px 8px !important;
+        vertical-align: baseline !important;
+    }
 </style>
 <div class="row" style="height: calc(100% - 60px);overflow-y: auto;">
     <div class="col-md-12 col-sm-12 col-xs-12">
@@ -32,8 +36,11 @@
                         <button id="qld" class="btn btn-sm btn-primary" type="button" onclick="initButtonChange(this,0)">
                             &nbsp;&nbsp;请领单&nbsp;&nbsp;
                         </button>
-                        <button id="xx" class="btn btn-sm btn-default" type="button" onclick="initButtonChange(this,1)">
-                            &nbsp;&nbsp;详细&nbsp;&nbsp;
+                        <button id="hz" class="btn btn-sm btn-default" type="button" onclick="initButtonChange(this,1)">
+                            &nbsp;&nbsp;汇总&nbsp;&nbsp;
+                        </button>
+                        <button id="mx" class="btn btn-sm btn-default" type="button" onclick="initButtonChange(this,2)">
+                            &nbsp;&nbsp;明细&nbsp;&nbsp;
                         </button>
                     </div>
                     <div class="form-group">
@@ -117,11 +124,11 @@
             </div>
 
             <div id="report_table_show"
-                 style="display: none;width:1300px;height: calc(100% - 160px);margin:0 auto;border: 1px solid #337ab7;font-size: 14px;padding: 40px 10px 40px 10px;overflow: scroll">
+                 style="display: none;width:1300px;height: calc(100% - 160px);margin:0 auto;border: 1px solid #337ab7;font-size: 13px;padding: 40px 10px 40px 10px;overflow: scroll">
                 <div id="hzdy_table_div">
                     <table id="hzdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: transparent !important;">
                         <tr style="font-weight: 700;background-color: #EBEBE4">
-                            <td colspan="9" style="font-size: 21px;text-align: center;border: transparent !important;"><span class="title">病房汇总领药单(统领单)</span></td>
+                            <td colspan="9" style="font-size: 18px;text-align: center;border: transparent !important;"><span class="title">病房汇总领药单(统领单)</span></td>
                         </tr>
                         <tr>
                             <td colspan="9" style="border: transparent !important;">&nbsp;</td>
@@ -150,7 +157,7 @@
                 <div id="mxdy_table_div">
                     <table id="mxdy_table" class="table table-striped table-bordered" style="margin-top: 0px;border: transparent !important;">
                         <tr style="font-weight: 700;background-color: #EBEBE4">
-                            <td colspan="13" style="font-size: 21px;text-align: center;border: transparent !important;"><span class="title">病房明细领药单（临时口服）</span></td>
+                            <td colspan="13" style="font-size: 18px;text-align: center;border: transparent !important;"><span class="title">病房明细领药单（临时口服）</span></td>
                         </tr>
                         <tr>
                             <td colspan="13" style="border: transparent !important;">&nbsp;</td>
@@ -167,18 +174,18 @@
                             <td class="xtd zyh" style="text-align: center;width: 60px;">住院号</td>
                             <td class="xtd" style="text-align: center;width: 60px;">姓名</td>
                             <td class="xtd" style="text-align: center;width: 40px;">床号</td>
-                            <td class="xtd" style="text-align: center;width: 150px;">药品名称</td>
-                            <td class="xtd" style="text-align: center;width: 100px;">规格</td>
+                            <td class="xtd" style="text-align: center;width: 120px;">药品名称</td>
+                            <td class="xtd" style="text-align: center;width: 80px;">规格</td>
                             <td class="xtd" style="text-align: center;width: 60px;">请领量</td>
                             <td class="xtd" style="text-align: center;width: 60px;">发药量</td>
                             <td class="xtd kfmxtd" style="text-align: center;width: 60px;">频率</td>
                             <td class="xtd kfmxtd" style="text-align: center;width: 40px;">剂量</td>
                             <td class="xtd kfmxtd" style="text-align: center;width: 40px;">单位</td>
-                            <td class="xtd kfmxtd" style="text-align: center;width: 60px;">嘱托</td>
+                            <td class="xtd kfmxtd" style="text-align: center;width: 80px;">嘱托</td>
                             <td class="xtd kfmxtd gyfs" style="text-align: center;width: 60px;">给药方式</td>
-                            <td class="xtd kssj" style="text-align: center;width: 60px;">22/01/01</td>
-                            <td class="xtd jssj" style="text-align: center;width: 60px;">22/01/02</td>
-                            <td class="xtd kfmxtd" style="text-align: center;width: 60px;">医生</td>
+                            <td class="xtd kssj" style="text-align: center;width: 50px;">22/01/01</td>
+                            <td class="xtd jssj" style="text-align: center;width: 50px;">22/01/02</td>
+                            <td class="xtd kfmxtd" style="text-align: center;width: 50px;">医生</td>
                             <td class="xtd yjmxtd" style="text-align: center;width: 60px;">零售价</td>
                             <td class="xtd yjmxtd" style="text-align: center;width: 80px;">金额</td>
                             <td class="xtd yjmxtd" style="text-align: center;width: 80px;">执行时间</td>
@@ -227,41 +234,19 @@
                     <table id="tb_table"></table>
                 </div>
             </div>
-            <div id="tb_detailed_table_div" style="display: none">
+            <div id="tb_summarizing_table_div" style="display: none">
                 <div class="col-md-12 col-sm-12 col-xs-12">
-                    <table id="tb_detailed_table"></table>
+                    <table id="tb_summarizing_table"></table>
                 </div>
             </div>
-        </div>
-    </div>
-</div>
-
-<!--请领单明细弹窗开始-->
-<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="prescriptionModal">
-    <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 1180px;height:600px;margin-left: -400px;background: #EBEBE4;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title modal-title-thmz">请领单药品明细</h4>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-md-12 col-sm-12 col-xs-12">
-                        <form id="basicInfoform" class="form-horizontal" autocomplete="off">
-                            <div class="form-group">
-                                <input id="orderNoLabel" class="form-control optional" type="hidden"/>
-                            </div>
-                        </form>
-                        <table id="tb_prescription_table" ></table>
-                    </div>
+            <div id="tb_detail_table_div" style="display: none">
+                <div class="col-md-12 col-sm-12 col-xs-12">
+                    <table id="tb_detail_table"></table>
                 </div>
             </div>
         </div>
     </div>
 </div>
-<!--请领单明细弹窗结尾-->
-
 
 <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>