From de088d01dd5988bc35948fb3a70223eabc163912 Mon Sep 17 00:00:00 2001
From: wzqgit <568275241@qq.com>
Date: Mon, 18 Jan 2021 19:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=EF=BC=9A?=
 =?UTF-8?q?=20=E7=97=85=E6=A1=88=E5=8F=AC=E5=9B=9E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E2=80=94=E2=80=942021.01.18=20=E7=8E=8B?=
 =?UTF-8?q?=E6=B3=BD=E9=92=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medicalRecallDir/medicalRecallList.jsp    | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
index 06f2d7c..b4b44bd 100644
--- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
@@ -254,14 +254,14 @@
         }
 
 
-        var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-        var deptArr = deptAdmissionTo.split(',');
-        //var n = (deptAdmissionTo.split(',')).length ;
-        if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) {
-            $('#deptDiv').show();
-        } else {
-            $('#deptDiv').hide();
-        }
+        // var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+        // var deptArr = deptAdmissionTo.split(',');
+        // //var n = (deptAdmissionTo.split(',')).length ;
+        // if (deptAdmissionTo == null || deptAdmissionTo == '' || deptArr.length > 1) {
+        //     $('#deptDiv').show();
+        // } else {
+        //     $('#deptDiv').hide();
+        // }
 
         function getDept() {
             //获取科室列表
@@ -272,17 +272,20 @@
                 success: function (result) {
                     if (result != null) {
                         for (var i = 0; i < result.length; i++) {
-                            if (deptArr.length != 1 && deptArr[0] != "") {
-                                var bol = deptArr.indexOf(result[i].code);
-                                if (bol != -1) {
-                                    $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
-                                }
-                            } else {
-                                $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
-                            }
+                            $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
                         }
                     }
-                    $(".selectpicker").selectpicker('refresh'); //
+                    $('#deptName').selectpicker('refresh');
+                    // for (var i = 0; i < result.length; i++) {
+                    //     if (deptArr.length != 1 && deptArr[0] != "") {
+                    //         var bol = deptArr.indexOf(result[i].code);
+                    //         if (bol != -1) {
+                    //             $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
+                    //         }
+                    //     } else {
+                    //         $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
+                    //     }
+                    // }
                 }
             });
         }
@@ -371,10 +374,11 @@
                          this.pageSize = currPageSize;
                      }
 
-                    // var url = window.location.href;
+                    var url = window.location.href;
+                    var deptName = '';
                     // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-                    //
-                    //
+
+
                     // var len = ($("#deptName").val()).length;
                     // if (len > 0) {
                     //     var deptNameT = $("#deptName").val();
@@ -382,8 +386,8 @@
                     //         deptName = $("#deptName").val().toString();
                     //     }
                     // }
-                    var url = window.location.href;
-                    var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+                    // var url = window.location.href;
+                    // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
                     var len = value.length;
                     if (len > 0) {
                         if (value.indexOf("") == -1) {