表格滚动条调整

src/main/java/cn/hnthyy/thmz/controller/mz/TCommonParamsController.java

@@ -107,7 +107,7 @@ public class TCommonParamsController {
      * @return
      */
     @UserLoginToken
-    @RequestMapping(value = "/getTCommonParamsByParamsType", method = {RequestMethod.POST})
+    @RequestMapping(value = "/getTCommonParamsByParamsType", method = {RequestMethod.GET})
     public Map<String, Object> getTCommonParamsByParamsType(@RequestParam("paramsType") Integer paramsType, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         try {

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

@@ -13,7 +13,7 @@ $(function () {
         minView: "month",
     });
 
-    initDaterangepickerWithId('reportrange',"right");
+    initDaterangepickerWithId('reportrange', "right");
 
     formatCheck();
 
@@ -1235,6 +1235,12 @@ function initRecommendList() {
     };
     //主诉弹窗
     var symptomWebuiPopover = $('#symptom').webuiPopover('destroy').webuiPopover(settings);
+    //体格检查弹窗
+    settings.height = 260;
+    $('#weight').webuiPopover('destroy').webuiPopover(settings);
+    //诊断弹窗
+    settings.height = 320;
+    var diagnoseWebuiPopover = $('#diagnose').webuiPopover('destroy').webuiPopover(settings);
     //用户姓名选中事件
     $("#symptom").on("click", function (t) {
         if ($(symptomWebuiPopover).css("display") == "block") {
@@ -1258,7 +1264,7 @@ function initRecommendList() {
                 '<input id="paramsNameInput" class="form-control" type="text" style="position: relative;top: 13px;height: 34px;">' +
                 '</div>' +
                 '<div style="float: left;margin-left: 10px;">\n' +
-                '                            <button type="button" class="btn" onclick="saveParams();"\n' +
+                '                            <button type="button" class="btn" onclick="saveParams(null);"\n' +
                 '                                    style="height: 30px;line-height: 15px;border-color: #2e69eb!important;color: #2e69eb;background-color: white;">' +
                 '             <svg class="bi" width="1em" height="1em" fill="currentColor" style="vertical-align: -.15em;margin-right: 10px!important;color: #2e69eb;">\n' +
                 '                <use xlink:href="/thmz/css/bootstrap/bootstrap-icons-1.5.0/bootstrap-icons.svg#plus-circle"></use>\n' +
@@ -1274,51 +1280,111 @@ function initRecommendList() {
         }
     });
 
-    settings.height=240;
-    //体格检查弹窗
-    $('#weight').webuiPopover('destroy').webuiPopover(settings);
+
     //体格检查各输入框选中事件
     $("#weight,#temperature,#sphygmus,#breathe,#pressure_high,#pressure_floor").on("click", function (t) {
         if ($("#webuiPopover2").css("display") == "block") {
-            $("#webuiPopover2").css("left",$("#webuiPopover1").css("left"));
-            if($("#healthCheckupContentHtml").html()==null || $("#healthCheckupContentHtml").html()!=""){
+            $("#webuiPopover2").css("left", $("#webuiPopover1").css("left"));
+            if ($("#healthCheckupContentHtml").html() == null || $("#healthCheckupContentHtml").html() == "") {
                 $("#webuiPopover2 div.arrow").css("left", "23px");
                 var html = '<span style="font-size: 18px;margin-left: 20px!important;color: #2e69eb!important;line-height: 50px;">体格检查</span>';
                 html += "<div style='width: 100%;height:210px;overflow-y: auto;padding: 0px 20px;' id='healthCheckupContentHtml'>";
                 html += "</div>";
                 $("#webuiPopover2 div.webui-popover-content").append(html);
-                loadHealthCheckup ();
+                loadHealthCheckup();
             }
             //loadSymptom();
-        }else {
+        } else {
             $('#weight').webuiPopover('show');
-            $("#webuiPopover2").css("left",$("#webuiPopover1").css("left"));
-            if($("#healthCheckupContentHtml").html()==null || $("#healthCheckupContentHtml").html()!=""){
+            $("#webuiPopover2").css("left", $("#webuiPopover1").css("left"));
+            if ($("#healthCheckupContentHtml").html() == null || $("#healthCheckupContentHtml").html() != "") {
                 $("#webuiPopover2 div.arrow").css("left", "23px");
                 var html = '<span style="font-size: 18px;margin-left: 20px!important;color: #2e69eb!important;line-height: 50px;">体格检查</span>';
                 html += "<div style='width: 100%;height:210px;overflow-y: auto;padding: 0px 20px;' id='healthCheckupContentHtml'>";
                 html += "</div>";
                 $("#webuiPopover2 div.webui-popover-content").append(html);
-                loadHealthCheckup ();
+                loadHealthCheckup();
             }
         }
         return false;
     });
+
+
+    //诊断选中事件
+    $("#diagnose").on("click", function (t) {
+        if ($(diagnoseWebuiPopover).css("display") == "block") {
+            $("#webuiPopover3 div.arrow").css("left", "23px");
+            $("#webuiPopover3 a.close").css("margin-top", "15px");
+            var html = '<span style="font-size: 18px;margin-left: 20px!important;color: #2e69eb!important;line-height: 50px;">诊断</span>';
+            html += '<div class="form-group has-feedback" style="float: right;width: 300px;margin-right: 20px;margin-top: 10px;">' +
+                '                            <input type="text" class="form-control has-feedback-left" ' +
+                '                                   placeholder="搜索" style="padding-left: 10px;" onchange="">' +
+                '                            <span class="fa fa-search form-control-feedback right" aria-hidden="true" style="right: 0px;"></span>\n' +
+                '                        </div>';
+            html += "<div style='width: 100%;height:210px;overflow-y: auto;padding: 0px 20px;' id='diagnoseContentHtml'>";
+            html += "</div>";
+            $("#webuiPopover3 div.webui-popover-content").append(html);
+            loadDiagnose();
+        }
+    });
+
+
+    // //主诉弹窗
+    // var diagnoseWebuiPopover = $('#diagnose').webuiPopover('destroy').webuiPopover(settings);
+    // //用户姓名选中事件
+    // $("#diagnose").on("click", function (t) {
+    //     if ($(diagnoseWebuiPopover).css("display") == "block") {
+    //         $("#webuiPopover1 div.arrow").css("left", "23px");
+    //         var html = '<span style="font-size: 18px;margin-left: 20px!important;color: #2e69eb!important;line-height: 50px;">主诉</span>';
+    //         html += "<div style='width: 100%;height:210px;overflow-y: auto;padding: 0px 20px;' id='contentHtml'>";
+    //         html += "</div>";
+    //         html += '<div style="height: 60px; line-height: 60px; font-size: 14px;">' +
+    //             '<div style="float: left">' +
+    //             '<span style="margin-left: 20px;">内容：</span> ' +
+    //             '</div>' +
+    //             '<div style="float: left;">' +
+    //             '<select class="form-control selectpicker show-tick" id="paramsType" dropupAuto="true">' +
+    //             '<option label="常用症状"  value="0">常用症状</option>' +
+    //             '<option label="常用时间"  value="1">常用时间</option>' +
+    //             '<option label="常用标点"  value="2">常用标点</option>' +
+    //             '<option label="常用词"  value="3">常用词</option>' +
+    //             '</select> ' +
+    //             '</div>' +
+    //             '<div style="width: 200px;float: left;margin-left: 10px;">' +
+    //             '<input id="paramsNameInput" class="form-control" type="text" style="position: relative;top: 13px;height: 34px;">' +
+    //             '</div>' +
+    //             '<div style="float: left;margin-left: 10px;">\n' +
+    //             '                            <button type="button" class="btn" onclick="saveParams(null);"\n' +
+    //             '                                    style="height: 30px;line-height: 15px;border-color: #2e69eb!important;color: #2e69eb;background-color: white;">' +
+    //             '             <svg class="bi" width="1em" height="1em" fill="currentColor" style="vertical-align: -.15em;margin-right: 10px!important;color: #2e69eb;">\n' +
+    //             '                <use xlink:href="/thmz/css/bootstrap/bootstrap-icons-1.5.0/bootstrap-icons.svg#plus-circle"></use>\n' +
+    //             '            </svg>' +
+    //             '新增' +
+    //             '                            </button>' +
+    //             '                        </div>' +
+    //             '</div>';
+    //         $("#webuiPopover1 div.webui-popover-content").append(html);
+    //         $('#paramsType').selectpicker('refresh');
+    //         $("#paramsType").parent().css("width", "140px").css("height", "34px");
+    //         loadSymptom();
+    //     }
+    // });
 }
 
 
 /**
  * 新增通用参数
+ * @param paramsType 参数类型 当参数类型为空时，去固定区域的值
  */
-function saveParams() {
+function saveParams(paramsType) {
     $.ajax({
         type: "POST",
         url: '/thmz/saveTCommonParams',
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         data: JSON.stringify({
-            "paramsType": $("#paramsType").val(),
-            "paramsName": $("#paramsNameInput").val()
+            "paramsType": paramsType != null ? paramsType : $("#paramsType").val(),
+            "paramsName": paramsType != null ? $("#diagnoseInput").val() : $("#paramsNameInput").val()
         }),
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (res) {
@@ -1328,10 +1394,16 @@ function saveParams() {
             }
             if (res.code == 0) {
                 successMesage(res);
-                $("#paramsNameInput").val(null);
                 // $("#paramsType").selectpicker('val', 0);
                 // $("#paramsType").selectpicker('refresh');
-                loadSymptom();
+                if (paramsType != null && paramsType == 4) {
+                    loadDiagnose();
+                    $("#diagnoseInput").val(null);
+                } else {
+                    loadSymptom();
+                    $("#paramsNameInput").val(null);
+                }
+
             } else {
                 errorMesage(res);
             }
@@ -1340,7 +1412,6 @@ function saveParams() {
 }
 
 
-
 /**
  * 加载主诉参数列表
  */
@@ -1364,7 +1435,7 @@ function loadSymptom() {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">常用症状：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.featureList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.featureList[i].paramsName+'\',\'symptom\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.featureList[i].paramsName + '\',\'symptom\')"><span style="padding: 0px 5px;">';
                         html += res.featureList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1375,7 +1446,7 @@ function loadSymptom() {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">常用时间：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.timeList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.timeList[i].paramsName+'\',\'symptom\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.timeList[i].paramsName + '\',\'symptom\')"><span style="padding: 0px 5px;">';
                         html += res.timeList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1386,7 +1457,7 @@ function loadSymptom() {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">常用标点：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.characterList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.characterList[i].paramsName+'\',\'symptom\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.characterList[i].paramsName + '\',\'symptom\')"><span style="padding: 0px 5px;">';
                         html += res.characterList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1397,7 +1468,7 @@ function loadSymptom() {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">常用词：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.wordsList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.wordsList[i].paramsName+'\',\'symptom\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.wordsList[i].paramsName + '\',\'symptom\')"><span style="padding: 0px 5px;">';
                         html += res.wordsList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1412,11 +1483,10 @@ function loadSymptom() {
 }
 
 
-
 /**
  * 加载体格检查参数列表
  */
-function loadHealthCheckup () {
+function loadHealthCheckup() {
     $.ajax({
         type: "GET",
         url: '/thmz/loadHealthCheckup',
@@ -1436,7 +1506,7 @@ function loadHealthCheckup () {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">体重：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.weightList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.weightList[i].paramsName+'\',\'weight\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.weightList[i].paramsName + '\',\'weight\')"><span style="padding: 0px 5px;">';
                         html += res.weightList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1447,7 +1517,7 @@ function loadHealthCheckup () {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">体温：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.temperatureList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.temperatureList[i].paramsName+'\',\'temperature\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.temperatureList[i].paramsName + '\',\'temperature\')"><span style="padding: 0px 5px;">';
                         html += res.temperatureList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1458,7 +1528,7 @@ function loadHealthCheckup () {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">脉搏：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.sphygmusList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.sphygmusList[i].paramsName+'\',\'sphygmus\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.sphygmusList[i].paramsName + '\',\'sphygmus\')"><span style="padding: 0px 5px;">';
                         html += res.sphygmusList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1469,7 +1539,7 @@ function loadHealthCheckup () {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">呼吸：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.breatheList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.breatheList[i].paramsName+'\',\'breathe\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.breatheList[i].paramsName + '\',\'breathe\')"><span style="padding: 0px 5px;">';
                         html += res.breatheList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1480,7 +1550,7 @@ function loadHealthCheckup () {
                     html += '<div style="width: 80px; line-height: 25px; float: left;font-size: 16px;">呼吸：</div>';
                     html += '<div style="width: calc(100% - 80px); float: left;">';
                     for (var i = 0; i < res.pressureList.length; i++) {
-                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\''+res.pressureList[i].paramsName+'\',\'pressure_\')"><span style="padding: 0px 5px;">';
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.pressureList[i].paramsName + '\',\'pressure_\')"><span style="padding: 0px 5px;">';
                         html += res.pressureList[i].paramsName;
                         html += '</span></button>';
                     }
@@ -1495,28 +1565,63 @@ function loadHealthCheckup () {
 }
 
 
+/**
+ * 加载诊断参数列表
+ */
+function loadDiagnose() {
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getTCommonParamsByParamsType?paramsType=4',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        async: false,
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var html = '';
+            if (res.code == 0) {
+                if (res.data != null && res.data.length > 0) {
+                    html += '<div>';
+                    for (var i = 0; i < res.data.length; i++) {
+                        html += '<button type="button" class="button_color" style="background-color: rgb(255, 255, 255);border: none;" onclick="fitValue(\'' + res.data[i].paramsName + '\',\'diagnose\')"><span style="padding: 0px 5px;">';
+                        html += res.data[i].paramsName;
+                        html += '</span></button>';
+                    }
+                    html += '</div>';
+                }
+            } else {
+                errorMesage(res);
+            }
+            $("#diagnoseContentHtml").html(html);
+        }
+    });
+}
+
 
 /**
  *  点击通用参数属性值时设置值到对应的区域
  * @param value
  * @param id
  */
-function fitValue(value,id) {
+function fitValue(value, id) {
     //当选择的是血压时
-    if(id=="pressure_"){
+    if (id == "pressure_") {
         var arr = value.split("/");
         $("#pressure_high").val(arr[0]);
         $("#pressure_floor").val(arr[1]);
         //当选的是体重，体温，脉搏和呼吸时
-    }else  if(id=="weight" || id=="temperature" || id=="sphygmus" || id=="breathe"){
-        $("#"+id).val(value);
-    }else {
+    } else if (id == "weight" || id == "temperature" || id == "sphygmus" || id == "breathe") {
+        $("#" + id).val(value);
+    } else {
         //主诉拼写时
-        var valueExist = $("#"+id).val();
-        if(valueExist!=null && valueExist!=""){
-            value = valueExist+value;
+        var valueExist = $("#" + id).val();
+        if (valueExist != null && valueExist != "") {
+            value = valueExist + value;
         }
-        $("#"+id).val(value);
+        $("#" + id).val(value);
     }
 }
 

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

@@ -8,9 +8,9 @@
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/js/mz/bissinessReport.js"></script>
 <title>门诊应收核算报表</title>
-<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">
+<div class="row" style="height: calc(100% - 60px);">
+    <div class="col-md-12 col-sm-12 col-xs-12" style="height: 100%;">
+        <div class="x_panel" style="height: 100%;">
             <div class="panel-body">
                 <form id="formSearch" class="form-horizontal" autocomplete="off">
                     <div class="form-group col-md-12 col-sm-12 col-xs-12">
@@ -54,7 +54,7 @@
 
                 </form>
             </div>
-            <div style="overflow:scroll;max-height: 900px;">
+            <div style="height: calc(100% - 90px);overflow-y: auto;width: 100%;overflow:scroll;">
                 <table id="tb_table" class="table table-striped table-bordered bulk_action"></table>
             </div>
         </div>

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

@@ -308,7 +308,7 @@
                     <div class="item form-group">
                         <label class="my_label">诊断：</label>
                         <div class="form-group has-feedback" style="float: right;width: calc(100% - 65px);">
-                            <input type="text" class="form-control has-feedback-left" id="symptom4"
+                            <input type="text" class="form-control has-feedback-left" id="diagnose"
                                    placeholder="请输入" style="padding-left: 10px;">
                             <span class="fa fa-search form-control-feedback right" aria-hidden="true" style="right: 0px;"></span>
                         </div>