核酸打印功能优化

src/main/resources/static/js/mz/hs_jc.js

@@ -551,12 +551,12 @@ function printJyJcReport(printType) {
     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.ADD_PRINT_TABLE("44mm", "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.ADD_PRINT_HTM("220mm", "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) {

src/main/resources/static/js/mz/hybrid_test_list.js

@@ -407,12 +407,12 @@ function printJyJcReport(printType) {
     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.ADD_PRINT_TABLE("44mm", "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.ADD_PRINT_HTM("220mm", "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) {

src/main/resources/static/js/mz/jy_jc.js

@@ -755,12 +755,12 @@ function printJyJcReport(printType) {
         LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("jc_detail").innerHTML);
     }
     if (typeIndex == 1) {
-        LODOP.ADD_PRINT_TABLE("37mm", "5mm", "130mm", "138mm", strStyle + document.getElementById("jy_detail_content").innerHTML);
+        LODOP.ADD_PRINT_TABLE("44mm", "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.ADD_PRINT_HTM("184mm", "5mm", "130mm", "200mm", strStyle + document.getElementById("jy_detail_foot").innerHTML);
         LODOP.SET_PRINT_STYLEA(0, "ItemType", 1);
         LODOP.SET_PRINT_STYLEA(0, "LinkedItem", 1);
     }

src/main/resources/templates/mz/hs_jc.html

@@ -138,25 +138,13 @@
                                 <table style="border-bottom: 1px solid black;border-collapse: collapse;width: 100%;text-align:left;">
                                     <tbody id="jyBody"></tbody>
                                 </table>
-                                <table style="margin-top: 50px;">
-                                    <tbody>
-                                    <tr>
-                                        <td>声明：</td>
-                                        <td>1、本检测结果可能受到采样时间、采样部位及方法局限性等因素影响，结果需结合临床进行分析。</td>
-                                    </tr>
-                                    <tr>
-                                        <td></td>
-                                        <td>2、本报告检测结果所使用的方法为实时荧光RT-PCR技术。</td>
-                                    </tr>
-                                    <tr>
-                                        <td></td>
-                                        <td>3、此报告仅对本次送检标本负责。</td>
-                                    </tr>
-                                    </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%;">声明：</div>
+                                    <div style="width: 100%;padding-left: 40px;">1、本检测结果可能受到采样时间、采样部位及方法局限性等因素影响，结果需结合临床进行分析。</div>
+                                    <div style="width: 100%;padding-left: 40px;">2、本报告检测结果所使用的方法为实时荧光RT-PCR技术。</div>
+                                    <div style="width: 100%;padding-left: 40px;">3、此报告仅对本次送检标本负责。</div>
                                     <div style="width: 100%;padding-left: 15px;">
                                         <div align="left" width="40%" style="float: left">送检医生：<span
                                                 id="orderUsrName"></span></div>

src/main/resources/templates/mz/hybrid_test_list.html

@@ -159,7 +159,7 @@
                                         <td colspan="2">标本：<span id="smpl_jy"></span></td>
                                     </tr>
                                     <tr>
-                                        <td colspan="1">证件类型：<span id="certificateType_jy"></span></td>
+                                        <td colspan="1">证件：<span id="certificateType_jy"></span></td>
                                         <td colspan="3">证件号：<span id="socialNo_jy"></span></td>
                                     </tr>
                                     <tr>
@@ -183,25 +183,13 @@
                                 <table style="border-bottom: 1px solid black;border-collapse: collapse;width: 100%;text-align:left;">
                                     <tbody id="jyBody"></tbody>
                                 </table>
-                                <table style="margin-top: 50px;">
-                                    <tbody>
-                                        <tr>
-                                            <td>声明：</td>
-                                            <td>1、本检测结果可能受到采样时间、采样部位及方法局限性等因素影响，结果需结合临床进行分析。</td>
-                                        </tr>
-                                        <tr>
-                                            <td></td>
-                                            <td>2、本报告检测结果所使用的方法为实时荧光RT-PCR技术。</td>
-                                        </tr>
-                                        <tr>
-                                            <td></td>
-                                            <td>3、此报告仅对本次送检标本负责。</td>
-                                        </tr>
-                                    </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%;">声明：</div>
+                                    <div style="width: 100%;padding-left: 40px;">1、本检测结果可能受到采样时间、采样部位及方法局限性等因素影响，结果需结合临床进行分析。</div>
+                                    <div style="width: 100%;padding-left: 40px;">2、本报告检测结果所使用的方法为实时荧光RT-PCR技术。</div>
+                                    <div style="width: 100%;padding-left: 40px;">3、此报告仅对本次送检标本负责。</div>
                                     <div style="width: 100%;padding-left: 15px;">
                                         <div align="left" width="40%" style="float: left">送检医生：<span
                                                 id="orderUsrName"></span></div>

src/main/resources/templates/mz/jy_jc.html

@@ -104,7 +104,7 @@
                                 <td>单号：<span id="report_no"></span></td>
                             </tr>
                             <tr>
-                                <td colspan="1">证件类型：<span id="certificateType_jc"></span></td>
+                                <td colspan="1">证件：<span id="certificateType_jc"></span></td>
                                 <td colspan="2">证件号：<span id="socialNo_jc"></span></td>
                             </tr>
                             </tbody>
@@ -190,7 +190,7 @@
                                     <td colspan="2">标本：<span id="smpl_jy"></span></td>
                                 </tr>
                                 <tr>
-                                    <td colspan="1">证件类型：<span id="certificateType_jy"></span></td>
+                                    <td colspan="1">证件：<span id="certificateType_jy"></span></td>
                                     <td colspan="3">证件号：<span id="socialNo_jy"></span></td>
                                 </tr>
                                 <tr>