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

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

@@ -227,7 +227,7 @@ function getSendDrugRecordData() {
                     html += '<td class="xtd" style="text-align: center;">' + data.name + '</td>';
                     html += '<td class="xtd" style="text-align: center;">' + sex + '</td>';
                     html += '<td class="xtd" style="text-align: center;">' + age.substring(0,age.indexOf('岁')) + '</td>';
-                    html += '<td class="xtd exclHide" style="text-align: center;">' + data.warnDeptName + '</td>';
+                    html += '<td class="xtd" style="text-align: center;">' + data.warnDeptName + '</td>';
                     html += '<td>' + data.icdText + '</td>';
                     html += '<td class="xtd" style="text-align: center;">' + data.chargeCode + '</td>';
                     html += '<td>' + data.drugName + '</td>';

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

@@ -108,7 +108,7 @@
                             <td class="xtd" style="text-align: center;width: 45px;">姓名</td>
                             <td class="xtd" style="text-align: center;width: 30px;">性别</td>
                             <td class="xtd" style="text-align: center;width: 30px;">年龄</td>
-                            <td class="xtd exclHide" style="text-align: center;width: 65px;">科室</td>
+                            <td class="xtd" style="text-align: center;width: 65px;">科室</td>
                             <td style="text-align: center;width: 120px;">诊断</td>
                             <td class="xtd" style="text-align: center;width: 45px;">编码</td>
                             <td style="text-align: center;width: 80px;">药名</td>