瀏覽代碼

优化核酸报告打印功能。支持核酸列表打印

hurugang 3 年之前
父節點
當前提交
e5f6fa5d20

+ 97 - 0
src/main/java/cn/hnthyy/thmz/controller/zd/JcJyController.java

@@ -9,6 +9,7 @@ import cn.hnthyy.thmz.entity.his.zd.*;
 import cn.hnthyy.thmz.entity.jy.InspectionDetail;
 import cn.hnthyy.thmz.entity.jy.InspectionHeader;
 import cn.hnthyy.thmz.entity.jy.InspectionsIndex;
+import cn.hnthyy.thmz.entity.thmz.HybirdTest;
 import cn.hnthyy.thmz.enums.GenderEnum;
 import cn.hnthyy.thmz.enums.YesNoEnum;
 import cn.hnthyy.thmz.service.his.jy.InspectionsService;
@@ -16,6 +17,7 @@ import cn.hnthyy.thmz.service.his.mz.MzZdCommonService;
 import cn.hnthyy.thmz.service.his.zd.*;
 import cn.hnthyy.thmz.service.his.mz.MzPatientMiService;
 import cn.hnthyy.thmz.service.his.mz.MzYjReqService;
+import cn.hnthyy.thmz.service.thmz.HybirdTestService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +59,8 @@ public class JcJyController {
     private MzZdCommonService mzZdCommonService;
     @Autowired
     private ZdChargeItemService zdChargeItemService;
+    @Autowired
+    private HybirdTestService hybirdTestService;
 
     /**
      * 查询检查检验列表
@@ -542,6 +546,99 @@ public class JcJyController {
     }
 
 
+    /**
+     * 根据就诊人ID和次数与报告类型查询核酸报告
+     * @param patientId
+     * @param times
+     * @param type 1 单人单管  2 混采
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/getHyBridTestByPatentIdAndTimes", method = {RequestMethod.GET})
+    public Map<String, Object> getHyBridTestByPatentIdAndTimes(@RequestParam("patientId") String patientId, @RequestParam("times") Integer times, @RequestParam("type") Integer type) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            if (patientId == null || StringUtils.isBlank(patientId)) {
+                resultMap.put("code", -1);
+                resultMap.put("data", new ArrayList<>());
+                resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败,病人门诊ID为空");
+                return resultMap;
+            }
+            if(times==null){
+                resultMap.put("code", -1);
+                resultMap.put("data", new ArrayList<>());
+                resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败,就诊次数为空");
+                return resultMap;
+            }
+            if(type==null){
+                resultMap.put("code", -1);
+                resultMap.put("data", new ArrayList<>());
+                resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败,报告类型为空");
+                return resultMap;
+            }
+            String oriPatientId=patientId;
+            if(Integer.valueOf(2).equals(type)){
+                HybirdTest hybirdTest=hybirdTestService.queryByPatientIdAndTimes(patientId,times);
+                if(hybirdTest==null){
+                    resultMap.put("code", -1);
+                    resultMap.put("data", new ArrayList<>());
+                    resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败,未查询到混采数据!");
+                    return resultMap;
+                }
+                patientId=hybirdTest.getParentPatientId();
+                times=1;
+            }
+            String beginTime = null;
+            String endTime = null;
+            String reqDate = jcJyItemChargeService.queryDateByPatientIdAndTimes(patientId, times);
+            if (StringUtils.isBlank(reqDate)) {
+                resultMap.put("code", -1);
+                resultMap.put("data", new ArrayList<>());
+                resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败,没有查询到对应的检验申请时间");
+                return resultMap;
+            }
+            beginTime = reqDate + " 00:00:00";
+            String lastDate =DateUtil.fomart(new Date(),"yyyy-MM-dd");
+            endTime = lastDate + " 23:59:59";
+            List<InspectionsIndex> inspectionsIndices = jcJyItemChargeService.getJyList(patientId, beginTime, endTime);
+            if (inspectionsIndices == null) {
+                resultMap.put("code", -1);
+                resultMap.put("data", new ArrayList<>());
+                resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败,暂时没有对应的报告");
+                return resultMap;
+            }
+            InspectionDetail data = inspectionsService.queryInspectionDetail(inspectionsIndices.get(0).getORDR_ID());
+            if (data == null) {
+                resultMap.put("code", -1);
+                resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败,暂时没有对应的报告");
+                return resultMap;
+            }
+            resultMap.put("code", 0);
+            resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告成功");
+            resultMap.put("data", data);
+            MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(oriPatientId);
+            mzPatientMi.setGender(GenderEnum.getGenderByCode(mzPatientMi.getSex()).name);
+            resultMap.put("mzPatientMi", mzPatientMi);
+            resultMap.put("data", data);
+            return resultMap;
+        } catch (MzException e) {
+            e.printStackTrace();
+            log.error("根据就诊人ID和次数与报告类型查询核酸报告失败,错误信息{}", e);
+            resultMap.put("code", -1);
+            resultMap.put("data", new ArrayList<>());
+            resultMap.put("message", e.getMessage());
+            return resultMap;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据就诊人ID和次数与报告类型查询核酸报告失败,错误信息{}", e);
+            resultMap.put("code", -1);
+            resultMap.put("data", new ArrayList<>());
+            resultMap.put("message", "根据就诊人ID和次数与报告类型查询核酸报告失败");
+            return resultMap;
+        }
+    }
+
+
 
 
 

+ 202 - 10
src/main/resources/static/js/mz/hs_jc.js

@@ -1,4 +1,7 @@
 //@ sourceURL=hs_jc.js
+var LODOP; //声明为全局变量
+//默认打印机下标
+var printIndex = -1;
 $(function () {
     //默认光标在卡号输入框
     $("#cardNo").focus();
@@ -19,6 +22,15 @@ $(function () {
     $("#btn_excel").click(function (t) {
         exportExcel();
     });
+
+    //打印检查检验报告单
+    $('#btn_print').click(function () {
+        printJyJcReport(1);
+    });
+    //打印设置检查检验报告单
+    $('#btn_print_setup').click(function () {
+        printJyJcReport(2);
+    });
 });
 
 
@@ -65,7 +77,7 @@ function initNucleicAcidListTable() {
         sidePagination: "server",           //分页方式:client客户端分页,server服务端分页(*)
         pageNumber: 1,                       //初始化加载第一页,默认第一页
         pageSize: 10,                       //每页的记录行数(*)
-        pageList: [5, 10, 25, 50, 100,1000,10000],        //可供选择的每页的行数(*)
+        pageList: [5, 10, 25, 50, 100, 1000, 10000],        //可供选择的每页的行数(*)
         search: false,                       //是否显示表格搜索,此搜索是客户端搜索,不会进服务端,所以,个人感觉意义不大
         strictSearch: true,
         showColumns: false,                  //是否显示所有的列
@@ -89,6 +101,10 @@ function initNucleicAcidListTable() {
                 title: '门诊ID',
                 align: "center",
                 valign: 'middle',
+                formatter: function (value, row, index) {
+                    var str = '<button type="button" class="btn btn-primary  btn-sm" onclick="viewHyBirdTest(\'' + row.patientId + '\',' + row.times + ',1)">核酸报告<i class="fa fa-print" style="margin-left: 10px;"></i></button>';
+                    return [str].join('');
+                }
             }, {
                 field: 'patientName',
                 title: '病人姓名',
@@ -153,9 +169,6 @@ function queryParams(params) {
 };
 
 
-
-
-
 /**
  * 初始化核酸检查(混检)申请列表
  */
@@ -174,7 +187,7 @@ function initHybridTestListTable() {
         sidePagination: "server",           //分页方式:client客户端分页,server服务端分页(*)
         pageNumber: 1,                       //初始化加载第一页,默认第一页
         pageSize: 10,                       //每页的记录行数(*)
-        pageList: [5, 10, 25, 50, 100,1000,10000],        //可供选择的每页的行数(*)
+        pageList: [5, 10, 25, 50, 100, 1000, 10000],        //可供选择的每页的行数(*)
         search: false,                       //是否显示表格搜索,此搜索是客户端搜索,不会进服务端,所以,个人感觉意义不大
         strictSearch: true,
         showColumns: false,                  //是否显示所有的列
@@ -198,6 +211,10 @@ function initHybridTestListTable() {
                 title: '门诊ID',
                 align: "center",
                 valign: 'middle',
+                formatter: function (value, row, index) {
+                    var str = '<button type="button" class="btn btn-primary  btn-sm" onclick="viewHyBirdTest(\'' + row.patientId + '\',' + row.times + ',2)">核酸报告<i class="fa fa-print" style="margin-left: 10px;"></i></button>';
+                    return [str].join('');
+                }
             }, {
                 field: 'name',
                 title: '病人姓名',
@@ -261,7 +278,6 @@ function queryHcParams(params) {
 };
 
 
-
 /**
  * 卡号输入改变事件
  */
@@ -360,12 +376,188 @@ function cleanParams() {
 function exportExcel() {
     var table2excel = new Table2Excel();
     var typeIndex = getIndex("pay_mark_group");
-    var title =null;
+    var title = null;
     if (typeIndex == 0) {
-        title="核酸检测(单人单管)列表";
+        title = "核酸检测(单人单管)列表";
     } else {
-        title="核酸检测(混采)列表";
+        title = "核酸检测(混采)列表";
     }
 // 传入你的tableId即可导出
     table2excel.export($('#tb_table_list'), title);
-}
+}
+
+
+/**
+ * 查看核酸报告
+ * @param patientId 门诊ID
+ * @param times 就诊次数
+ * @param type 1 单人单管 2 混检
+ */
+function viewHyBirdTest(patientId,times,type) {
+    clearInspectionDetail();
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getHyBridTestByPatentIdAndTimes?patientId=' + patientId+'&times='+times+'&type='+type,
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                var mzPatientMi = res.mzPatientMi;
+                $("#patientId_t_jy").text(mzPatientMi.patientId);
+                $("#name_t_jy").text(mzPatientMi.name);
+                $("#gender_jy").text(mzPatientMi.gender);
+                $("#age_jy").text(mzPatientMi.age);
+                var html = "";
+                if (res.data != null) {
+                    var inspectionHeader = res.data.inspectionHeader;
+                    $("#reqDept_t_jy").text(inspectionHeader.dept_NAME);
+                    $("#bed_no_jy").text(inspectionHeader.ptnt_BED_NO);
+                    $("#smpl_jy").text(inspectionHeader.smpl_NAME);
+                    $("#item_jy").text(inspectionHeader.aply_CNTN);
+                    $("#applyDate").text(format(inspectionHeader.aply_DATE, "yyyy-MM-dd HH:mm:ss"));
+                    $("#orderCreateDate").text(format(inspectionHeader.ordr_CREATE_DATE, "yyyy-MM-dd HH:mm:ss"));
+                    $("#auditTime").text(format(inspectionHeader.audt_TIME, "yyyy-MM-dd HH:mm:ss"));
+                    $("#orderUsrName").text(inspectionHeader.ordr_USR_NAME);
+                    $("#testUsrName").text(inspectionHeader.test_USR_NAME);
+                    $("#auditUsrName").text(inspectionHeader.audt_USR_NAME);
+                    var inspectionItems = res.data.inspectionItems;
+                    if (inspectionItems != null && inspectionItems.length > 0) {
+                        for (var i = 0; i < inspectionItems.length; i++) {
+                            html += "<tr>";
+                            var obj = inspectionItems[i];
+                            var itm_VALUE = (obj.itm_VALUE == null || obj.itm_VALUE == "" || obj.itm_VALUE == "null") ? obj.itm_STR_VALUE : obj.itm_VALUE;
+                            var range = (obj.range == null || obj.range == "" || obj.range == "null") ? obj.range_STR : obj.range;
+                            html += "<td width='25%'>" + obj.itm_NAME + "</td>";
+                            html += "<td width='16.66%'>" + itm_VALUE + "</td>";
+                            html += "<td width='16.66%'>" + obj.itm_UNIT + "</td>";
+                            if (obj.itm_ALERT == null || obj.itm_ALERT == "") {
+                                html += "<td width='16.66%'><span style=\"color:#67C23A;font-weight:bold\"></span></td>";
+                            } else if (obj.itm_ALERT == "H") {
+                                html += "<td width='16.66%'><span style=\"color:#F56C6C;font-weight:bold\">↑</span></td>";
+                            } else if (obj.itm_ALERT == "L") {
+                                html += "<td width='16.66%'><span style=\"color:#F56C6C;font-weight:bold\">↓</span></td>";
+                            }
+                            html += "<td width='25%'>" + range + "</td>";
+                            html += "</tr>";
+                        }
+                    }
+                }
+                $("#jyBody").html(html);
+                $("#patientModal").modal("hide");
+                $("#previewYjReqModal").modal();
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}
+
+
+
+/**
+ * 关闭核酸混检预览弹窗
+ */
+function closePreviewYjReqModal() {
+    $("#previewYjReqModal").modal("hide");
+    $("#patientModal").modal();
+}
+
+
+
+/**
+ * 清空检验明细
+ * @param orderId
+ */
+function clearInspectionDetail() {
+    $("#patientId_t_jy").text("");
+    $("#name_t_jy").text("");
+    $("#gender_jy").text("");
+    $("#age_jy").text("");
+    $("#reqDept_t_jy").text("");
+    $("#bed_no_jy").text("");
+    $("#smpl_jy").text("");
+    $("#item_jy").text("");
+    $("#applyDate").text("");
+    $("#orderCreateDate").text("");
+    $("#auditTime").text("");
+    $("#orderUsrName").text("");
+    $("#testUsrName").text("");
+    $("#auditUsrName").text("");
+    $("#jyBody").html("");
+}
+
+
+/**
+ * 查询默认打印机
+ */
+function setPrint() {
+    if (printIndex >= 0) {
+        return;
+    }
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getLastWindowsByCurrentUser',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        async: false,
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                printIndex = res.data.cgPrintIndex;
+            } else {
+                printIndex = -1;
+            }
+        }
+    });
+}
+
+
+
+
+/**
+ * 打印检查检验报告单
+ * @param printType 打印模式 1 预览打印  2 打印设置
+ */
+function printJyJcReport(printType) {
+    setPrint();
+    LODOP = getLodop();
+    LODOP.PRINT_INITA(6, 0, "148mm", "210mm", "长沙泰和医院检验报告单");
+    LODOP.SET_PRINT_STYLE("FontSize", 7); //字体大小
+    //设置默认打印机
+    LODOP.SET_PRINTER_INDEX(printIndex);
+    LODOP.SET_SHOW_MODE("BKIMG_WIDTH", "148mm");
+    LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", "210mm");
+    LODOP.SET_PRINT_PAGESIZE(1, "148mm", "210mm", "CreateCustomPage");
+    LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "检验报告单");//对新建的纸张重命名
+    //intDispMode:预览比例,数字型,0-适高  1-正常大小  2-适宽
+    //intToolMode:工具条和按钮,数字型  0-显示(上方)工具栏   1-显示(下方)按钮栏    2-两个都显示   3-两个都不显示
+    //blDirectPrint: 打印按钮是否“直接打印” 1-是  0-否(弹出界面“选机打印”)
+    //intWidth,intHeight 窗口的宽和高,整数型,单位是px
+    //strTitleButtonCaptoin 预览窗口和打印按钮的名称组合,字符型,用“点”分隔
+    //LODOP.SET_PREVIEW_WINDOW(intDispMode,intToolMode,blDirectPrint,intWidth,intHeight,strTitleButtonCaptoin)
+    LODOP.SET_PREVIEW_WINDOW(0, 2, 0, 700, 900, "");
+    //LODOP.SET_PRINT_STYLE("FontSize", 8); //字体大小
+    var strStyle = "<style>table{width: 96%;} #jy_detail_content thead {border-bottom: 1px solid black;border-collapse: collapse;}</style>";
+    LODOP.ADD_PRINT_TABLE("37mm", "5mm", "130mm", "138mm", strStyle + document.getElementById("jy_detail_content").innerHTML);
+    LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
+    LODOP.ADD_PRINT_HTM("0mm", "5mm", "130mm", "200mm", strStyle + document.getElementById("jy_detail_title").innerHTML);
+    LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
+    LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
+    LODOP.ADD_PRINT_HTM("177mm", "5mm", "130mm", "200mm", strStyle + document.getElementById("jy_detail_foot").innerHTML);
+    LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
+    LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
+    if (printType == 1) {
+        LODOP.PREVIEW();
+    } else if (printType == 2) {
+        LODOP.PRINT_SETUP();
+    }
+}

+ 0 - 4
src/main/resources/static/js/mz/hybrid_test_list.js

@@ -262,7 +262,6 @@ function showPatientModal(parentPatientId) {
  * @param orderId
  */
 function clearInspectionDetail() {
-    canBePrintJy = false;
     $("#patientId_t_jy").text("");
     $("#name_t_jy").text("");
     $("#gender_jy").text("");
@@ -300,9 +299,6 @@ function viewHyBirdTest(patientId,parentPatientId) {
                 return;
             }
             if (res.code == 0) {
-                canBePrintJy = true;
-                $("#jc_detail").removeClass("in").addClass("hide");
-                $("#jy_detail").removeClass("hide").addClass("in");
                 var mzPatientMi = res.mzPatientMi;
                 $("#patientId_t_jy").text(mzPatientMi.patientId);
                 $("#name_t_jy").text(mzPatientMi.name);

+ 1 - 1
src/main/resources/static/js/user_manage.js

@@ -102,7 +102,7 @@ function initDeptSelect() {
     //科室列表
     $.ajax({
         type: "GET",
-        url: '/thmz/allMzUnitCode',
+        url: '/thmz/allUnitCode',
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (data) {

+ 121 - 0
src/main/resources/templates/mz/hs_jc.html

@@ -5,8 +5,16 @@
 <script src="/thmz/js/dependent/bootstrap-select.js"></script>
 <script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/excel/table2excel.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <script src="/thmz/js/mz/hs_jc.js"></script>
 <title>核酸检查申请列表</title>
+<!-- 打印的样式-->
+<style media="print">
+    @page {
+        size: auto;
+        margin: 0mm;
+    }
+</style>
 <div class="row" style="height: calc(100% - 60px);overflow-y: auto;">
     <div class="col-md-12 col-sm-12 col-xs-12">
         <div class="x_panel" style="background: #EBEBE4;">
@@ -58,3 +66,116 @@
 
 
 
+<!--检验报告弹窗开始-->
+<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="previewYjReqModal">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content" style="width: 1080px;max-height: 600px;overflow-y: auto;">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" onclick="closePreviewYjReqModal()"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title modal-title-thmz">检验报告</h4>
+            </div>
+            <div class="modal-body">
+                <div class="panel-body" style="padding: 0px;">
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="text-align: right;">
+                        <button type="button" style="margin-left:3px" id="btn_print" class="btn btn-primary"
+                                title="打印报告"><i class="fa fa-print"></i>
+                        </button>
+                        <button type="button" style="margin-left:3px" id="btn_print_setup" class="btn btn-primary"
+                                title="打印设置"><i class="fa fa-cog"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="col-md-12 col-sm-12 col-xs-12">
+                    <div id="jy_detail">
+                        <div style="padding-top: 20px;line-height: 25px;">
+                            <div id="jy_detail_title" style="width: 100%;">
+                                <table width="100%" style="font-size: 15px;text-align:center;">
+                                    <tbody>
+                                    <tr>
+                                        <td></td>
+                                        <td colspan="2" style="font-weight: 700;font-size: 18px;">
+                                            泰和医院门诊检验报告单
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table style="width: 100%;margin-top: 20px;text-align:left;">
+                                    <tbody>
+                                    <tr>
+                                        <td>门诊号:<span id="patientId_t_jy"></span></td>
+                                        <td>姓名:<span id="name_t_jy"></span></td>
+                                        <td>性别:<span id="gender_jy"></span></td>
+                                        <td>年龄:<span id="age_jy"></span></td>
+                                    </tr>
+                                    <tr>
+                                        <td>科室:<span id="reqDept_t_jy"></span></td>
+                                        <td>床号:<span id="bed_no_jy"></span></td>
+                                        <td colspan="2">标本:<span id="smpl_jy"></span></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4">项目:<span id="item_jy"></span></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <table style="border-bottom: 1px solid black;border-top: 1px solid black;border-collapse: collapse;width: 100%;text-align:left;">
+                                    <thead style="border-bottom: 1px solid black;border-collapse: collapse;">
+                                    <tr>
+                                        <th width="25%;" style="text-align: left;">检验项目</th>
+                                        <th width="16.66%;" style="text-align: left;">结果</th>
+                                        <th width="16.66%;" style="text-align: left;">单位</th>
+                                        <th width="16.66%;" style="text-align: left;">说明</th>
+                                        <th width="25%;" style="text-align: left;">参考值</th>
+                                    </tr>
+                                    </thead>
+                                </table>
+                            </div>
+                            <div id="jy_detail_content" style="width: 100%;">
+                                <table style="border-bottom: 1px solid black;border-collapse: collapse;width: 100%;text-align:left;">
+                                    <tbody id="jyBody"></tbody>
+                                </table>
+                            </div>
+                            <div id="jy_detail_foot" style="width: 100%;">
+                                <div style="border-bottom: 1px solid black;width: 100%;padding-bottom: 2px;">
+                                    <div style="width: 100%;padding-left: 15px;">
+                                        <div align="left" width="40%" style="float: left">送检医生:<span
+                                                id="orderUsrName"></span></div>
+                                        <div align="right" width="60%" style="float: right;padding-right: 15px;">送检时间:<span
+                                                id="applyDate"></span></div>
+                                        <div style="clear: both"></div>
+                                    </div>
+                                    <div style="width: 100%;padding-left: 15px;">
+                                        <div style="padding-left: 13px;float: left;" width="40%" align="left">检验人:<span
+                                                id="testUsrName"></span></div>
+                                        <div align="right" width="60%" style="float: right;padding-right: 15px;">检验时间:<span
+                                                id="orderCreateDate"></span></div>
+                                        <div style="clear: both"></div>
+                                    </div>
+                                    <div style="width: 100%;padding-left: 15px;">
+                                        <div style="padding-left: 13px;float: left;" width="40%" align="left">审核人:<span
+                                                id="auditUsrName"></span></div>
+                                        <div align="right" width="60%" style="float: right;padding-right: 15px;">报告时间:<span
+                                                id="auditTime"></span></div>
+                                        <div style="clear: both"></div>
+                                    </div>
+                                </div>
+                                <div style="width: 100%;font-weight: bold;text-align: center;">***此结果仅对所检测的标本负责***
+                                    备注:升高(↑),降低(↓),阳性(+),阴性(-)
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <input type="hidden" id="previewYjReqModalPatientId"/>
+                <button type="button" class="btn btn-default" data-dismiss="modal" onclick="closePreviewYjReqModal()">关闭</button>
+            </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>
+</object>

+ 2 - 2
src/main/resources/templates/mz/hybrid_test_list.html

@@ -122,11 +122,11 @@
             </div>
             <div class="modal-body">
                 <div class="panel-body" style="padding: 0px;">
-                    <div class="form-group col-md-12 col-sm-12 col-xs-12 hide" style="text-align: right;">
+                    <div class="form-group col-md-12 col-sm-12 col-xs-12" style="text-align: right;">
                         <button type="button" style="margin-left:3px" id="btn_print" class="btn btn-primary"
                                 title="打印报告"><i class="fa fa-print"></i>
                         </button>
-                        <button type="button" style="margin-left:3px" id="btn_print_setup" class="btn btn-primary hide"
+                        <button type="button" style="margin-left:3px" id="btn_print_setup" class="btn btn-primary"
                                 title="打印设置"><i class="fa fa-cog"></i>
                         </button>
                     </div>