Merge branch 'dev-1.1.4' into 'dev-1.1.4'

门诊检验单打印修改

See merge request lihong/thmz_system!60

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzYjReq.java

@@ -99,7 +99,10 @@ public class MzYjReq extends PageBean {
     private Date chargeDate;
     //收费金额
     private BigDecimal chargeFee;
-
+    //执行科室名称
+    private String execName;
+    //检验物名称
+    private String inspectName;
 
     public MzYjReq() {
     }

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzYjReqMapper.java

@@ -176,7 +176,11 @@ public interface MzYjReqMapper {
             "select req_no,patient_id,p_name patient_name,birth_date,times,receipt_no,order_no,item_no,p_bar_code,group_name,order_code,order_name,page_no,req_comment,req_doctor,",
             "req_ward,exec_dept,req_date,inspect_part,inspect_stuff,sample_status,rtrim(print_flag) print_flag,rtrim(receive_flag) receive_flag,req_type,result_comment,sys_date,",
             "rtrim(pay_mark) pay_mark,rtrim(status_flag) status_flag,serial_no,cash_id,jy_remark,req_other_result,original_list_no,req_tz_comment,rtrim(jz_flag) jz_flag,req_studyid,",
-            "percent_ft,rtrim(confirm_flag) confirm_flag,confirm_time,confirm_id,rtrim(print_flag_yj) print_flag_yj,quantity from mz_yj_req WITH(NOLOCK) where 1=1 ",
+            "percent_ft,rtrim(confirm_flag) confirm_flag,confirm_time,confirm_id,rtrim(print_flag_yj) print_flag_yj,quantity," +
+            "isnull(jy.name, inspect_stuff) as inspect_name,isnull(u.name, exec_dept) as exec_name from mz_yj_req WITH(NOLOCK) " +
+            "left join zd_unit_code as u on u.code = exec_dept " +
+            "left join jy_zd_sample as jy on jy.code = inspect_stuff " +
+            "where 1=1 ",
             "<when test='payMark!=null'>",
             " and pay_mark =#{payMark}",
             "</when>",

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

@@ -11358,7 +11358,7 @@ function printYjReq(patientId, times, type, printType) {
                 $("#jyReqReqDept").text(res.data.deptName);
                 $("#jyReqReqDoctor").text(res.data.doctorName);
                 //检验报告列表名
-                var jyTitle = '<tr><th style="min-height: 30px;border-bottom: 1px solid black;">检验项目</th><th style="min-height: 30px;border-bottom: 1px solid black;">标本</th><th style="min-height: 30px;border-bottom: 1px solid black;">单号</th></tr>';
+                var jyTitle = '<tr><th style="min-height: 30px;border-bottom: 1px solid black;">执行科室</th><th style="min-height: 30px;border-bottom: 1px solid black;">检验项目</th><th style="min-height: 30px;border-bottom: 1px solid black;">标本</th><th style="min-height: 30px;border-bottom: 1px solid black;">单号</th></tr>';
                 var jyContent = "";
                 var needNewPageA = false;
                 for (var i = 0; i < res.data.mzYjReqList.length; i++) {
@@ -11384,8 +11384,8 @@ function printYjReq(patientId, times, type, printType) {
                         LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("jc_card_table").innerHTML);
                         needNewPageA = true;
                     } else if (obj.reqType == "2") {
-                        var inspectStuff = (obj.inspectStuff == null || obj.inspectStuff == "null") ? "" : obj.inspectStuff;
-                        jyContent += '<tr><td style="min-height: 30px;">' + obj.groupName + '</td><td>' + inspectStuff + '</td><td>' + obj.reqNo + '</td></tr>';
+                        let inspectName = (obj.inspectName == null || obj.inspectName == "null") ? "" : obj.inspectName;
+                        jyContent += '<tr><td>' + obj.execName + '</td><td style="min-height: 30px;">' + obj.groupName + '</td><td>' + inspectName + '</td><td>' + obj.reqNo + '</td></tr>';
                         JsBarcode("#JyBarcode", obj.reqNo, {
                             lineColor: '#333', //线条颜色
                             width: 1, //线宽