实现接诊处方开立的时候药品和项目的上下键选择。解决化验药敏试验数据

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -2506,6 +2506,11 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     //是给药方式产生的诊疗项目，不添加进构造的处方
                     if (supplyChargeItemCodeSet != null && supplyChargeItemCodeSet.contains(mzChargeDetail.getChargeItemCode())) {
                         supplyList.add(mzChargeDetail);
+                    }else {
+                        YpZdDict ypZdDict = ypZdDictService.queryYpZdDictByCodeAndSerial(mzChargeDetail.getChargeItemCode(), mzChargeDetail.getSerial());
+                        if(ypZdDict!=null && StringUtils.isNotBlank(ypZdDict.getName())){
+                            mzChargeDetail.setTcName(ypZdDict.getName());
+                        }
                     }
                     sbd.setLength(0);
                     temSet.add(sbd.append(mzChargeDetail.getPatientId()).append("_").append(mzChargeDetail.getTimes()).append("_").append(mzChargeDetail.getReceiptNo()).append("_").append(mzChargeDetail.getItemNo()).append("_").append(mzChargeDetail.getChargeItemCode()).toString());

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

@@ -9,7 +9,7 @@ var LODOP; //声明为全局变量
 //默认打印机下标
 var printIndex = -1;
 // //当前光标点击的元素ID
- var currentEleId = null;
+var currentEleId = null;
 //打开检查检验报告的时候不知道哪个有报告，如果检查没有就自动打开检验，但是为了防止死循环，次数加到1就不在进行重试
 var retryCount = 0;
 $(function () {
@@ -147,11 +147,11 @@ $(function () {
                     } else {
                         errorMesageSimaple("当前病人没有分诊信息");
                     }
-                } else if(res.code == 200){
+                } else if (res.code == 200) {
                     clearRapidAcceptsModal();
                     $("#rapidAcceptsModal").modal("hide");
                     clinicalReception(patientIdDb, null);
-                }else{
+                } else {
                     errorMesage(res);
                 }
             }
@@ -221,7 +221,7 @@ $(function () {
             return;
         }
         $('#western_medicine_name').webuiPopover('show');
-        loadYpList(0);
+        loadYpList(0, null);
     });
 
     /**
@@ -235,7 +235,7 @@ $(function () {
             return;
         }
         $('#chinese_medicine_name').webuiPopover('show');
-        loadYpList(1);
+        loadYpList(1, null);
     });
 
     /**
@@ -248,7 +248,7 @@ $(function () {
             return;
         }
         $('#jcJyItem').webuiPopover('show');
-        loadjcJyItemList();
+        loadjcJyItemList(null);
     });
     initYshPart();
     initJyZdSample();
@@ -259,11 +259,11 @@ $(function () {
 
     //键盘监听回车键
     $(document).unbind("keyup").keyup(function (event) {
+        var index = getIndex("bill_item_group");
         if (event.keyCode == 13) {  //是否是回车
             var el = event.srcElement || event.target;
             var id = el.getAttribute("id");
             var current_code = $("#current_code").val();
-            var index = getIndex("bill_item_group");
             if (id == null || id == "") {
                 id = el.getAttribute("data-id");
             }
@@ -273,11 +273,11 @@ $(function () {
                     id = $(el).parent().parent().prev().attr("data-id");
                 }
             }
-            if(id!=null && id != ""){
+            if (id != null && id != "") {
                 //将当前点击的id记录下
-                currentEleId=id;
-            }else if(currentEleId!=null){
-                id=currentEleId;
+                currentEleId = id;
+            } else if (currentEleId != null) {
+                id = currentEleId;
             }
             //回车时，光标不在任何区域判断是不是在药品和诊疗开立区域
             if (id == null || id == "") {
@@ -292,12 +292,15 @@ $(function () {
                 } else if (index == 2) {
                     if (current_code != null && current_code != "") {
                         //当前页面是医技保存页面，且有选中
-                        if ($("#jyZdSampleDiv").hasClass('hide')) {
-                            //检验物是隐藏，说明现在是检查
-                            $("#yshPart").next().click();
-                        } else {
+                        if ($("#jyZdSampleDiv").hasClass('in')) {
                             //此时是检验
                             $("#jyZdSample").next().click();
+                        } else  if ($("#yshPartDiv").hasClass('in')) {
+                            //说明现在是检查
+                            $("#yshPart").next().click();
+                        }else  if ($("#chargeUnitDiv").hasClass('in')) {
+                            //说明现在是检查
+                            $("#yshPart").next().click();
                         }
                     }
                 } else if (index == 3) {
@@ -308,20 +311,21 @@ $(function () {
             }
             console.log("id=" + id);
             var customization = $("div.customization").not(".hide");
-            //回车时，光标不在任何区域，默认点击主诉
-            if (id == null || id == "") {
-                var eleId = $(customization[0]).attr("target-id");
-                $("#" + eleId).focus();
-                if (eleId == 'symptom') {
-                    $("#" + eleId).click();
-                }
-                console.log("eleId=" + eleId);
-            } else if (id == 'symptom' || id == 'emrHpi' || id == 'emrPs' || id == 'personalHistory' || id == 'familyHistory' || id == 'obstericalHistory' || id == 'otherCheck' || id == 'diagnose' || id == 'tentativeDiagnosis') {
+            // //回车时，光标不在任何区域，默认点击主诉
+            // if (id == null || id == "") {
+            //     var eleId = $(customization[0]).attr("target-id");
+            //     $("#" + eleId).focus();
+            //     if (eleId == 'symptom') {
+            //         $("#" + eleId).click();
+            //     }
+            //     console.log("eleId=" + eleId);
+            // } else
+            if (id == 'symptom' || id == 'emrHpi' || id == 'emrPs' || id == 'personalHistory' || id == 'familyHistory' || id == 'obstericalHistory' || id == 'otherCheck' || id == 'diagnose' || id == 'tentativeDiagnosis') {
                 console.log("1id=" + id);
                 if (id != $(customization[customization.length - 1]).attr("target-id")) {
                     var next = $("#" + id + "Flag").next();
-                    while($(next).hasClass("foreclose") || $(next).hasClass("hide")){
-                        next=$(next).next();
+                    while ($(next).hasClass("foreclose") || $(next).hasClass("hide")) {
+                        next = $(next).next();
                     }
                     var eleId = $(next).attr("target-id");
                     $("#" + eleId).focus();
@@ -330,10 +334,10 @@ $(function () {
                     }
                     console.log("1eleId=" + eleId);
                 } else {
-                    var data_target=$("#symptom").attr("data-target");
-                    $("#"+data_target).find("a.close").click();
-                    data_target=$("#diagnose").attr("data-target");
-                    $("#"+data_target).find("a.close").click();
+                    var data_target = $("#symptom").attr("data-target");
+                    $("#" + data_target).find("a.close").click();
+                    data_target = $("#diagnose").attr("data-target");
+                    $("#" + data_target).find("a.close").click();
                     if (index == 0) {
                         $("#western_medicine_name").focus();
                     } else if (index == 1) {
@@ -406,6 +410,7 @@ $(function () {
                 $("#remark").focus();
             } else if (id == 'remark') {
                 saveJyJcItem(true);
+                $("#jcJyItem").focus();
             } else if (id == 'saveJyJcItem') {
                 $("#jcJyItem").focus();
                 $("#jcJyItem").click();
@@ -415,32 +420,243 @@ $(function () {
                 $("#admissStatus").next().click();
             } else if (id == 'admissStatus') {
                 saveZyReq(true);
+                $("#zy_req_button").focus();
             } else if (id == 'western_medicine_name') {
-                if (current_code != null && current_code != "") {
-                    //已经选中药品，跳到用法
-                    $("#supplyType").next().click();
-                } else {
+                var webuiID = $("#western_medicine_name").attr("data-target");
+                if (webuiID == null || webuiID == "null" || webuiID == "") {
                     //药品查询框是空白的，打开查询框
                     $("#western_medicine_name").click();
+                    return;
+                }
+                //选择框打开
+                if ($("#" + webuiID).hasClass("in")) {
+                    var arr = $("#tb_table_western_medicine").find("tbody").find("tr.trhover");
+                    if (arr != undefined && arr != null && arr.length > 0) {
+                        var dataIndex=$(arr).attr("data-index");
+                        var tableData = $("#tb_table_western_medicine").bootstrapTable('getData');
+                        if(tableData!=null && tableData.length>0 && dataIndex!=null){
+                            var trData = tableData[dataIndex];
+                            checkYpInfo(trData.code, trData.serial, trData.ypType, true);
+                            $("#western_medicine_name").click();
+                        }
+                    } else {
+                        //药品查询框是空白的，打开查询框
+                        $("#western_medicine_name").click();
+                    }
+                } else {
+                    if (current_code != null && current_code != "") {
+                        //已经选中药品，跳到用法
+                        $("#supplyType").next().click();
+                    } else {
+                        //药品查询框是空白的，打开查询框
+                        $("#western_medicine_name").click();
+                    }
                 }
             } else if (id == 'chinese_medicine_name') {
-                if (current_code != null && current_code != "") {
-                    $("#supplyType").next().click();
-                }else {
+                var webuiID = $("#chinese_medicine_name").attr("data-target");
+                if (webuiID == null || webuiID == "null" || webuiID == "") {
                     $("#chinese_medicine_name").click();
+                    return;
+                }
+                //选择框打开
+                if ($("#" + webuiID).hasClass("in")) {
+                    var arr = $("#tb_table_chinese_medicine").find("tbody").find("tr.trhover");
+                    if (arr != undefined && arr != null && arr.length > 0) {
+                        var dataIndex=$(arr).attr("data-index");
+                        var tableData = $("#tb_table_chinese_medicine").bootstrapTable('getData');
+                        if(tableData!=null && tableData.length>0 && dataIndex!=null){
+                            var trData = tableData[dataIndex];
+                            checkZyInfo(trData.code, trData.serial, true);
+                            $("#chinese_medicine_name").click();
+                        }
+                    } else {
+                        //药品查询框是空白的，打开查询框
+                        $("#chinese_medicine_name").click();
+                    }
+                } else {
+                    if (current_code != null && current_code != "") {
+                        //已经选中药品，跳到剂量
+                        $("#zy_drugWin").next().click();
+                    } else {
+                        //药品查询框是空白的，打开查询框
+                        $("#chinese_medicine_name").click();
+                    }
                 }
-
             } else if (id == 'jcJyItem') {
-                if (current_code != null && current_code != "") {
-                    $("#supplyType").next().click();
-                }else {
+                var webuiID = $("#jcJyItem").attr("data-target");
+                if (webuiID == null || webuiID == "null" || webuiID == "") {
                     $("#jcJyItem").click();
+                    return;
+                }
+                //选择框打开
+                if ($("#" + webuiID).hasClass("in")) {
+                    var arr = $("#tb_table_jc_jy_item").find("tbody").find("tr.trhover");
+                    if (arr != undefined && arr != null && arr.length > 0) {
+                        var dataIndex=$(arr).attr("data-index");
+                        var tableData = $("#tb_table_jc_jy_item").bootstrapTable('getData');
+                        if(tableData!=null && tableData.length>0 && dataIndex!=null){
+                            var trData = tableData[dataIndex];
+
+                            $('#jcJyItem').webuiPopover('hide');
+                            $("#jcJyZltype").val(trData.type);
+                            $("#execUnit").selectpicker('val', trData.execUnit);//默认不选中
+                            $("#execUnit").selectpicker('refresh');
+                            if (trData.type == 3) {
+                                //诊疗
+                                if ($("#zlTab").find("li") == null || $("#zlTab").find("li").length == 0) {
+                                    initNavTabs(2);
+                                }
+                                $("#jcJyItem").val(trData.name);
+                                $("#jcJyItem").blur();
+                                $("#jcjyItemPrice").val(trData.chargeAmount);
+                                $("#chargeUnit").val(trData.specification);
+                                $("#current_code").val(trData.code);
+                                $("#jcJyItemChargeDetail").removeClass("in").addClass("hide");
+                                $("#chargeUnitDiv").removeClass("hide").addClass("in");
+                                $("#jyZdSampleDiv").removeClass("in").addClass("hide");
+                                $("#yshPartDiv").removeClass("in").addClass("hide");
+                                $("#itemQuantityDiv").removeClass("hide").addClass("in");
+                                $("#itemQuantity").val(1);
+                                $("#chargeUnit").focus();
+                                //  currentEleId = 'chargeUnit';
+                                return;
+                            }
+                            if (trData.type == 1) {
+                                //检验
+                                $("#jyZdSampleDiv").removeClass("hide").addClass("in");
+                                $("#chargeUnitDiv").removeClass("in").addClass("hide");
+                                $("#yshPartDiv").removeClass("in").addClass("hide");
+                                if (trData.sampleCode != null && trData.sampleCode != "") {
+                                    $("#jyZdSample").selectpicker('val', trData.sampleCode);
+                                    $('#jyZdSample').selectpicker('refresh');
+                                }
+                            } else if (trData.type == 2) {
+                                //检查
+                                $("#yshPartDiv").removeClass("hide").addClass("in");
+                                $("#jyZdSampleDiv").removeClass("in").addClass("hide");
+                                $("#chargeUnitDiv").removeClass("in").addClass("hide");
+                                if (trData.bwCode != null && trData.bwCode != "") {
+                                    $("#yshPart").selectpicker('val', trData.bwCode);
+                                    $('#yshPart').selectpicker('refresh');
+                                }
+                            }
+                            $("#itemQuantityDiv").removeClass("in").addClass("hide");
+                            $("#jcJyItemChargeDetail").removeClass("hide").addClass("in");
+                            checkJcJyItemInfo(trData.code, trData.name, trData.type, true);
+                        }
+                    } else {
+                        //药品查询框是空白的，打开查询框
+                        $("#jcJyItem").click();
+                    }
+                } else {
+                    if (current_code != null && current_code != "") {
+                        //当前页面是医技保存页面，且有选中
+                        if ($("#jyZdSampleDiv").hasClass('in')) {
+                            //此时是检验
+                            $("#jyZdSample").next().click();
+                        } else  if ($("#yshPartDiv").hasClass('in')) {
+                            //说明现在是检查
+                            $("#yshPart").next().click();
+                        }else  if ($("#chargeUnitDiv").hasClass('in')) {
+                            //说明现在是检查
+                            $("#yshPart").next().click();
+                        }
+                    } else {
+                        //药品查询框是空白的，打开查询框
+                        $("#jcJyItem").click();
+                    }
                 }
             } else if (id == 'zy_req_button') {
                 //当前页面是住院保存页面,此时光标在入院按钮上
                 console.log("入院按钮")
                 $("#inpatientWardBeHospitalized").next().click();
             }
+        } else if (event.keyCode == 38) {
+            //上键事件
+            var tableId = null;
+            var inputId = null;
+            var contentId = null;
+            if (index == 0) {
+                tableId = "tb_table_western_medicine";
+                inputId = "western_medicine_name";
+                contentId = "westernMedicinePopoverContent";
+            } else if (index == 1) {
+                tableId = "tb_table_chinese_medicine";
+                inputId = "chinese_medicine_name";
+                contentId = "chineseMedicinePopoverContent";
+            } else if (index == 2) {
+                tableId = "tb_table_jc_jy_item";
+                inputId = "jcJyItem";
+                contentId = "jcJyItemPopoverContent";
+            }
+            if (inputId == null) {
+                return;
+            }
+            var webuiID = $("#" + inputId).attr("data-target");
+            if (webuiID == null || webuiID == "null" || webuiID == "") {
+                return;
+            }
+            //选择框打开
+            if ($("#" + webuiID).hasClass("in")) {
+                var arr = $("#" + tableId).find("tbody").find("tr.trhover");
+                var prev = $(arr).prev();
+                if (arr != undefined && arr != null && arr.length > 0) {
+                    if (prev != undefined && prev != null && prev.length > 0) {
+                        $(arr).removeClass("trhover");
+                        $(prev).addClass("trhover");
+                        var height = $(arr).css("height");
+                        $("#" + contentId).parent().animate({scrollTop: "-=" + height}, 100);
+                    }
+                } else {
+                    var arrs = $("#" + tableId).find("tbody").find("tr");
+                    $(arrs[0]).addClass("trhover");
+                    var height = $(arrs[0]).css("height");
+                    $("#" + contentId).parent().animate({scrollTop: "+=" + height}, 100);
+                }
+            }
+        } else if (event.keyCode == 40) {
+            //下键事件
+            var tableId = null;
+            var inputId = null;
+            var contentId = null;
+            if (index == 0) {
+                tableId = "tb_table_western_medicine";
+                inputId = "western_medicine_name";
+                contentId = "westernMedicinePopoverContent";
+            } else if (index == 1) {
+                tableId = "tb_table_chinese_medicine";
+                inputId = "chinese_medicine_name";
+                contentId = "chineseMedicinePopoverContent";
+            } else if (index == 2) {
+                tableId = "tb_table_jc_jy_item";
+                inputId = "jcJyItem";
+                contentId = "jcJyItemPopoverContent";
+            }
+            if (inputId == null) {
+                return;
+            }
+            var webuiID = $("#" + inputId).attr("data-target");
+            if (webuiID == null || webuiID == "null" || webuiID == "") {
+                return;
+            }
+            //选择框打开
+            if ($("#" + webuiID).hasClass("in")) {
+                var arr = $("#" + tableId).find("tbody").find("tr.trhover");
+                var next = $(arr).next();
+                if (arr != undefined && arr != null && arr.length > 0) {
+                    if (next != undefined && next != null && next.length > 0) {
+                        $(arr).removeClass("trhover");
+                        $(next).addClass("trhover");
+                        var height = $(arr).css("height");
+                        $("#" + contentId).parent().animate({scrollTop: "+=" + height}, 100);
+                    }
+                } else {
+                    var arrs = $("#" + tableId).find("tbody").find("tr");
+                    $(arrs[0]).addClass("trhover");
+                    var height = $(arrs[0]).css("height");
+                    $("#" + contentId).parent().animate({scrollTop: "+=" + height}, 100);
+                }
+            }
         }
     });
 
@@ -3899,19 +4115,19 @@ function initRecommendList() {
     settings.width = 680;
     settings.closeable = false;
     settings.arrow = false;//显示箭头或不显示箭头
-    settings.content = '<div id="westernMedicinePopoverContent" style="background: #EBEBE4;"><table id="tb_table_western_medicine"></table></div>';
+    settings.content = '<div id="westernMedicinePopoverContent"><table id="tb_table_western_medicine"></table></div>';
     //手动触发
     settings.trigger = 'manual';
     var westernMedicineWebuiPopover = $('#western_medicine_name').webuiPopover('destroy').webuiPopover(settings);
     //中药弹窗
     settings.trigger = 'click';
-    settings.content = '<div id="chineseMedicinePopoverContent" style="background: #EBEBE4;"><table id="tb_table_chinese_medicine"></table></div>';
+    settings.content = '<div id="chineseMedicinePopoverContent"><table id="tb_table_chinese_medicine"></table></div>';
     //手动触发
     settings.trigger = 'manual';
     var chineseMedicineWebuiPopover = $('#chinese_medicine_name').webuiPopover('destroy').webuiPopover(settings);
     //诊疗与医技弹窗
     settings.trigger = 'manual';
-    settings.content = '<div id="jcJyItemPopoverContent" style="background: #EBEBE4;"><table id="tb_table_jc_jy_item"></table></div>';
+    settings.content = '<div id="jcJyItemPopoverContent"><table id="tb_table_jc_jy_item"></table></div>';
     var jcJyItemWebuiPopover = $('#jcJyItem').webuiPopover('destroy').webuiPopover(settings);
     //主诉选中事件
     $("#symptom").on("click", function (t) {
@@ -4387,19 +4603,25 @@ function fitValue(value, id) {
  * 加载药品列表数列表
  * @param index
  */
-function loadYpList(index) {
-    //var medicinePopoverContent = null;
+function loadYpList(index, event) {
+    if (event != null) {
+        if (event.keyCode == 38 || event.keyCode == 40 || event.keyCode == 13) {
+            //上下键不刷新表格
+            return;
+        }
+    }
+    var medicinePopoverContent = null;
     var tableMedicine = null;
     var MedicineName = null;
     //var groupNo=null;
     if (index == 0) {
-        //  medicinePopoverContent = "westernMedicinePopoverContent";
+        medicinePopoverContent = "westernMedicinePopoverContent";
         tableMedicine = "tb_table_western_medicine";
         MedicineName = "western_medicine_name";
         // groupNo=71;
     }
     if (index == 1) {
-        //   medicinePopoverContent = "chineseMedicinePopoverContent";
+        medicinePopoverContent = "chineseMedicinePopoverContent";
         tableMedicine = "tb_table_chinese_medicine";
         MedicineName = "chinese_medicine_name";
         // groupNo=$("#zyClassType").val();
@@ -4523,7 +4745,7 @@ function loadYpList(index) {
                     "rows": {}   //数据
                 };
             }
-
+            $("#"+medicinePopoverContent).parent().css("background","#EBEBE4");
             return {
                 "total": ress.data.length,//总页数
                 "rows": ress.data   //数据
@@ -4701,7 +4923,7 @@ function checkZyInfo(code, serial, async) {
                     }
                     $("#chinese_medicine_name").val(res.data.name);
                     $("#chinese_medicine_name").blur();
-                    $("#zy_drugWin").val(res.data.weight);
+                    //$("#zy_drugWin").val(res.data.weight);
                     $("#zy_packRetprice").val(res.data.packRetprice);
                     $("#current_code").val(res.data.code);
                     $("#current_serial").val(res.data.serial);
@@ -4723,7 +4945,13 @@ function checkZyInfo(code, serial, async) {
  * 加载医技与诊疗列表
  * @param index
  */
-function loadjcJyItemList() {
+function loadjcJyItemList(event) {
+    if (event != null) {
+        if (event.keyCode == 38 || event.keyCode == 40 || event.keyCode == 13) {
+            //上下键不刷新表格
+            return;
+        }
+    }
     // if (!$("#jcJyItemPopoverContent").parent().parent().parent().hasClass("in")) {
     //     return;
     // }
@@ -4791,13 +5019,13 @@ function loadjcJyItemList() {
                 valign: 'middle',
                 // sortable: true
                 formatter: function (value, row, index) {
-                    if(value==1 || value=="1"){
+                    if (value == 1 || value == "1") {
                         return "检验";
                     }
-                    if(value==2 || value=="2"){
+                    if (value == 2 || value == "2") {
                         return "辅助检查";
                     }
-                    if(value==3 || value=="3"){
+                    if (value == 3 || value == "3") {
                         return "诊疗";
                     }
                     return "";
@@ -4817,7 +5045,7 @@ function loadjcJyItemList() {
                     "rows": {}   //数据
                 };
             }
-
+            $("#jcJyItemPopoverContent").parent().css("background","#EBEBE4");
             return {
                 "total": ress.data.length,//总页数
                 "rows": ress.data   //数据
@@ -5901,10 +6129,10 @@ function initzTree() {
                         }
                     };
                     $.fn.zTree.init($("#treeDemo"), setting, res.data);
-                    var webuiId=$("#treeButton").attr("data-target");
-                    var top=$("#"+webuiId).css("top");
-                    if(top.indexOf("-")==0){
-                        $("#"+webuiId).css("top",'0px');
+                    var webuiId = $("#treeButton").attr("data-target");
+                    var top = $("#" + webuiId).css("top");
+                    if (top.indexOf("-") == 0) {
+                        $("#" + webuiId).css("top", '0px');
                     }
                 } else {
                     errorMesage(res);
@@ -5933,10 +6161,10 @@ function initzTree() {
                         }
                     };
                     $.fn.zTree.init($("#treeDemo"), setting, res.data);
-                    var webuiId=$("#treeButton").attr("data-target");
-                    var top=$("#"+webuiId).css("top");
-                    if(top.indexOf("-")==0){
-                        $("#"+webuiId).css("top",'0px');
+                    var webuiId = $("#treeButton").attr("data-target");
+                    var top = $("#" + webuiId).css("top");
+                    if (top.indexOf("-") == 0) {
+                        $("#" + webuiId).css("top", '0px');
                     }
                 } else {
                     errorMesage(res);
@@ -5965,11 +6193,11 @@ function zTreeOnClick(event, treeId, treeNode) {
     if (index == 0) {
         $("#western_medicine_name").val(treeNode.id);
         $('#western_medicine_name').webuiPopover('show');
-        loadYpList(0);
+        loadYpList(0, null);
     } else if (index == 2) {
         $("#jcJyItem").val(treeNode.id);
         $('#jcJyItem').webuiPopover('show');
-        loadjcJyItemList();
+        loadjcJyItemList(null);
     }
 }
 
@@ -7879,7 +8107,7 @@ function initJcListTable() {
             $("#patientId_t").text(row.patientId);
             $("#name_t").text(row.patientName);
             $("#date_t").text(format(row.reqDate, "yyyy-MM-dd HH:mm:ss"));
-            fitJcDetail(row.reqNo,row.patientId);
+            fitJcDetail(row.reqNo, row.patientId);
         },
         responseHandler: function (res) {
             if (res == '401' || res == 401) {
@@ -7940,10 +8168,10 @@ function queryParams(params) {
  * 加载检查明细
  * @param reqNo
  */
-function fitJcDetail(reqNo,patientId) {
+function fitJcDetail(reqNo, patientId) {
     $.ajax({
         type: "GET",
-        url: '/thmz/getYjJcRecordReport?hisReqNo=' + reqNo+"&patientId="+patientId,
+        url: '/thmz/getYjJcRecordReport?hisReqNo=' + reqNo + "&patientId=" + patientId,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -8173,16 +8401,16 @@ function queryInspectionDetail(orderId) {
                         for (var i = 0; i < inspectionItems.length; i++) {
                             html += "<tr>";
                             var obj = inspectionItems[i];
-                            var itm_VALUE =obj.itm_VALUE;
-                            if(itm_VALUE==null || itm_VALUE=="null"){
-                                itm_VALUE="";
+                            var itm_VALUE = obj.itm_VALUE;
+                            if (itm_VALUE == null || itm_VALUE == "null") {
+                                itm_VALUE = "";
                             }
-                            itm_VALUE+= (obj.itm_STR_VALUE == null || obj.itm_STR_VALUE == "null") ? "" : obj.itm_STR_VALUE;
-                            var range =obj.range;
-                            if(range==null || range=="null"){
-                                range="";
+                            itm_VALUE += (obj.itm_STR_VALUE == null || obj.itm_STR_VALUE == "null") ? "" : obj.itm_STR_VALUE;
+                            var range = obj.range;
+                            if (range == null || range == "null") {
+                                range = "";
                             }
-                            range+= (obj.range_STR == null || obj.range_STR == "null") ? "" : obj.range_STR;
+                            range += (obj.range_STR == null || obj.range_STR == "null") ? "" : obj.range_STR;
                             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>";
@@ -8195,6 +8423,44 @@ function queryInspectionDetail(orderId) {
                             }
                             html += "<td width='25%'>" + range + "</td>";
                             html += "</tr>";
+                            var bacteriaResults=obj.bacteriaResults;
+                            if(bacteriaResults==null || bacteriaResults.length==0){
+                                continue;
+                            }
+                            var bacteriaResult= bacteriaResults[0];
+                            if(bacteriaResult==null || bacteriaResult.length==0){
+                                continue;
+                            }
+                            var antibioticResults=bacteriaResult.antibioticResults;
+                            if(antibioticResults==null || antibioticResults.length==0){
+                                continue;
+                            }
+                            html+= '<tr><th width="35%;" style="text-align: left;padding-left: 2%;" >抗菌药物</th><th width="20%;" style="text-align: left;">药物编码</th><th width="30%;" style="text-align: left;">MIC值</th><th width="15%;" style="text-align: left;padding-right: 2%;">敏感性</th></tr>';
+                            for (var j = 0; j < antibioticResults.length; j++) {
+                                var antibioticResultsObj=antibioticResults[j];
+                                html+= "<tr>";
+                                html+="<td width='35%' style='padding-left: 2%;";
+                                if(j==0){
+                                    html+="border-top: 1px solid black;";
+                                }
+                                html+="'>" + antibioticResultsObj.anti_NAME_CN + "</td>";
+                                html+="<td width='20%' ";
+                                if(j==0){
+                                    html+="style='border-top: 1px solid black;'";
+                                }
+                                html+=">" + antibioticResultsObj.anti_ABB + "</td>";
+                                html+="<td width='25%' ";
+                                if(j==0){
+                                    html+="style='border-top: 1px solid black;'";
+                                }
+                                html+=">" + antibioticResultsObj.anti_MIC + "</td>";
+                                html+="<td width='20%' style='padding-right: 2%;";
+                                if(j==0){
+                                    html+="border-top: 1px solid black;";
+                                }
+                                html+="'>" + antibioticResultsObj.anti_VALUE + "</td>";
+                                html+= "</tr>";
+                            }
                         }
                     }
                 }
@@ -8409,9 +8675,9 @@ function showMzBlRecordModal(patientId, times, type) {
                 }
                 if (mzBlRecord.emrProcess != null && mzBlRecord.emrProcess != "") {
                     var reg = new RegExp("</br>", "g");//g,表示全部替换。
-                    var editEmrProcess=mzBlRecord.emrProcess.replace(reg, "\n");
+                    var editEmrProcess = mzBlRecord.emrProcess.replace(reg, "\n");
                     reg = new RegExp("&nbsp;", "g");//g,表示全部替换。
-                    editEmrProcess=editEmrProcess.replace(reg, "");
+                    editEmrProcess = editEmrProcess.replace(reg, "");
                     $("#editEmrProcess").val(editEmrProcess);
                     $("#editEmrProcess").parent().parent().parent().css("display", "block");
                 } else {

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

@@ -533,6 +533,44 @@ function queryInspectionDetail(orderId) {
                             }
                             html += "<td width='25%'>" + range + "</td>";
                             html += "</tr>";
+                            var bacteriaResults=obj.bacteriaResults;
+                            if(bacteriaResults==null || bacteriaResults.length==0){
+                                continue;
+                            }
+                            var bacteriaResult= bacteriaResults[0];
+                            if(bacteriaResult==null || bacteriaResult.length==0){
+                                continue;
+                            }
+                            var antibioticResults=bacteriaResult.antibioticResults;
+                            if(antibioticResults==null || antibioticResults.length==0){
+                                continue;
+                            }
+                             html+= '<tr><th width="35%;" style="text-align: left;padding-left: 2%;" >抗菌药物</th><th width="20%;" style="text-align: left;">药物编码</th><th width="30%;" style="text-align: left;">MIC值</th><th width="15%;" style="text-align: left;padding-right: 2%;">敏感性</th></tr>';
+                            for (var j = 0; j < antibioticResults.length; j++) {
+                                var antibioticResultsObj=antibioticResults[j];
+                                html+= "<tr>";
+                                html+="<td width='35%' style='padding-left: 2%;";
+                                if(j==0){
+                                    html+="border-top: 1px solid black;";
+                                }
+                                html+="'>" + antibioticResultsObj.anti_NAME_CN + "</td>";
+                                html+="<td width='20%' ";
+                                if(j==0){
+                                    html+="style='border-top: 1px solid black;'";
+                                }
+                                html+=">" + antibioticResultsObj.anti_ABB + "</td>";
+                                html+="<td width='25%' ";
+                                if(j==0){
+                                    html+="style='border-top: 1px solid black;'";
+                                }
+                                html+=">" + antibioticResultsObj.anti_MIC + "</td>";
+                                html+="<td width='20%' style='padding-right: 2%;";
+                                if(j==0){
+                                    html+="border-top: 1px solid black;";
+                                }
+                                html+="'>" + antibioticResultsObj.anti_VALUE + "</td>";
+                                html+= "</tr>";
+                            }
                         }
                     }
                 }

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

@@ -209,6 +209,9 @@
         height: 28px;
         line-height: 28px;
     }
+    .trhover{
+        background-color:white;
+    }
 </style>
 <div class="row" style="height: calc(100% - 60px);overflow-y: auto;">
     <div style="margin-top: 10px;width: 310px;float: left;height: calc(100% - 10px);overflow-y: auto;">
@@ -511,7 +514,7 @@
                                             <input type="text" class="form-control has-feedback-left"
                                                    id="western_medicine_name"
                                                    placeholder="请输入" style="padding-left: 10px;width: 95%"
-                                                   required="required" onKeyUp="loadYpList(0)">
+                                                   required="required" onKeyUp="loadYpList(0,event)">
                                             <span class="fa fa-search form-control-feedback right"
                                                   aria-hidden="true"></span>
                                         </div>
@@ -643,7 +646,7 @@
                                             <input type="text" class="form-control has-feedback-left"
                                                    id="chinese_medicine_name"
                                                    placeholder="请输入" style="padding-left: 10px;width: 99%"
-                                                   required="required" onkeyup="loadYpList(1)">
+                                                   required="required" onkeyup="loadYpList(1,event)">
                                             <span class="fa fa-search form-control-feedback right"
                                                   aria-hidden="true"></span>
                                         </div>
@@ -701,7 +704,7 @@
                                         <div class="form-group has-feedback" style="float: right;width: 340px;">
                                             <input type="text" class="form-control has-feedback-left" id="jcJyItem"
                                                    placeholder="请输入" style="padding-left: 10px;width: 99%"
-                                                   onKeyUp="loadjcJyItemList()"
+                                                   onKeyUp="loadjcJyItemList(event)"
                                                    required="required">
                                             <span class="fa fa-search form-control-feedback right"
                                                   aria-hidden="true"></span>