项目结构调整

src/main/java/cn/hnthyy/thmz/controller/NavigationController.java

@@ -9,7 +9,6 @@ import cn.hnthyy.thmz.service.thmz.UserRoleRelationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
@@ -79,7 +78,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/unit-code")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "unit_code";
+        return "mz/unit_code";
     }
 
     /**
@@ -93,7 +92,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/registration")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "registration";
+        return "mz/registration";
     }
 
     /**
@@ -107,19 +106,19 @@ public class NavigationController {
         if (!urls.contains("/thmz/registration-list")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "registration_list";
+        return "mz/registration_list";
     }
 
-    private List<String> getUrls(HttpServletRequest httpServletRequest) throws Exception {
-        User tokenUser = TokenUtil.getUser(httpServletRequest);
-        List<UserMenuRelation> userMenuRelationList = userMenuRelationService.queryByUserId(tokenUser.getId());
-        List<Long> menuIds = userMenuRelationList.stream().map(UserMenuRelation::getMenuId).collect(Collectors.toList());
-        if (menuIds == null || menuIds.size() == 0) {
-            throw new Exception("您没有此模块的权限，请联系管理员开通！");
-        }
-        List<Menu> menuList = menuService.queryByIds(menuIds);
-        return menuList.stream().map(Menu::getMenuUrl).collect(Collectors.toList());
-    }
+//    private List<String> getUrls(HttpServletRequest httpServletRequest) throws Exception {
+//        User tokenUser = TokenUtil.getUser(httpServletRequest);
+//        List<UserMenuRelation> userMenuRelationList = userMenuRelationService.queryByUserId(tokenUser.getId());
+//        List<Long> menuIds = userMenuRelationList.stream().map(UserMenuRelation::getMenuId).collect(Collectors.toList());
+//        if (menuIds == null || menuIds.size() == 0) {
+//            throw new Exception("您没有此模块的权限，请联系管理员开通！");
+//        }
+//        List<Menu> menuList = menuService.queryByIds(menuIds);
+//        return menuList.stream().map(Menu::getMenuUrl).collect(Collectors.toList());
+//    }
 
     private List<String> getRoleUrls(HttpServletRequest httpServletRequest) throws Exception {
         User tokenUser = TokenUtil.getUser(httpServletRequest);
@@ -149,7 +148,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/toll-administration")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "toll_administration";
+        return "mz/toll_administration";
     }
 
 
@@ -193,7 +192,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/print-config")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "print_config";
+        return "mz/print_config";
     }
 
     /**
@@ -222,7 +221,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/daily")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "daily";
+        return "mz/daily";
     }
 
 
@@ -237,7 +236,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/daily-repeat-print")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "daily_repeat_print";
+        return "mz/daily_repeat_print";
     }
 
     /**
@@ -251,7 +250,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/daily-collect")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "daily_collect";
+        return "mz/daily_collect";
     }
 
     /**
@@ -265,7 +264,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/charge-list")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "charge_list";
+        return "mz/charge_list";
     }
 
 
@@ -280,7 +279,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/refund-medicine")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "refund_medicine";
+        return "mz/refund_medicine";
     }
 
 
@@ -295,7 +294,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/mzsrmx")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "mzsrmx";
+        return "mz/mzsrmx";
     }
 
 
@@ -310,7 +309,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/mzhbtj")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "mzhbtj";
+        return "mz/mzhbtj";
     }
 
 
@@ -325,7 +324,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/bissinessReport")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "bissinessReport";
+        return "mz/bissinessReport";
     }
 
     /**
@@ -339,7 +338,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/request")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "request";
+        return "mz/request";
     }
 
     /**
@@ -353,7 +352,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/cash-work-count")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "cash_work_count";
+        return "mz/cash_work_count";
     }
 
 
@@ -397,7 +396,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/request-config")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "request-config";
+        return "mz/request-config";
     }
 
     /**
@@ -411,7 +410,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/schedule-of-medical")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "schedule-of-medical";
+        return "mz/schedule-of-medical";
     }
 
 
@@ -426,7 +425,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/schedule-of-medical-apply")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "schedule-of-medical-apply";
+        return "mz/schedule-of-medical-apply";
     }
 
 
@@ -456,7 +455,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/hospitalized")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "hospitalized";
+        return "zy/hospitalized";
     }
 
 
@@ -471,7 +470,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/request-holidays-config")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "request_holidays_config";
+        return "mz/request_holidays_config";
     }
 
 
@@ -486,7 +485,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/accepting")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "accepting";
+        return "zy/accepting";
     }
 
 
@@ -501,7 +500,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/actpatient")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "actpatient";
+        return "zy/actpatient";
 
     }
 
@@ -516,7 +515,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/request-type")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "request_type";
+        return "mz/request_type";
     }
 
     /**
@@ -530,7 +529,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/charge-detail")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "charge_detail";
+        return "mz/charge_detail";
     }
 
 
@@ -545,7 +544,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/to-medicine")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "to-medicine";
+        return "mz/to-medicine";
     }
 
 
@@ -574,7 +573,7 @@ public class NavigationController {
         if (!urls.contains("/thmz/data-util")) {
             throw new Exception("您没有此模块的权限，请联系管理员开通！");
         }
-        return "data_util";
+        return "mz/data_util";
     }
 
 

src/main/resources/templates/charge/discount.html

@@ -1,10 +1,10 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/validator.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
 <script src="/thmz/js/common/map-util.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/js/charge/discount.js"></script>
 <div class="row">

src/main/resources/templates/charge/paid_from_zz.html

@@ -2,8 +2,8 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/charge/paid_from_zz.js"></script>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/common/head.html

@@ -3,8 +3,8 @@
 <!--声明static为页面片段名称-->
 <head th:fragment="static">
     <script type="text/javascript" th:inline="javascript"> </script>
-    <script src="/thmz/js/jquery.min.js"></script>
-    <script src="/thmz/js/bootstrap.min.js"></script>
+    <script src="/thmz/js/dependent/jquery.min.js"></script>
+    <script src="/thmz/js/dependent/bootstrap.min.js"></script>
     <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap.min.css">
 </head>
 </html>

src/main/resources/templates/index.html

@@ -3,8 +3,8 @@
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/index.css">
 <script src="/thmz/js/chart/Chart.bundle.js"></script>
-<script src="/thmz/js/moment.min.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/moment.min.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/index.js"></script>
 <title>主页面</title>
 <div class="row top_tiles">

src/main/resources/templates/login.html

@@ -19,7 +19,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/thmz/ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/thmz/ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="/thmz/ico/apple-touch-icon-57-precomposed.png">
-    <script src="/thmz/js/jquery.backstretch.min.js"></script>
+    <script src="/thmz/js/dependent/jquery.backstretch.min.js"></script>
     <script src="/thmz/js/login.js"></script>
     <title>登陆页</title>
 </head>

src/main/resources/templates/menu.html

@@ -273,36 +273,36 @@
         <!-- /footer content -->
     </div>
 </div>
-<script src="/thmz/js/jquery.min.js"></script>
-<script src="/thmz/js/bootstrap.min.js"></script>
+<script src="/thmz/js/dependent/jquery.min.js"></script>
+<script src="/thmz/js/dependent/bootstrap.min.js"></script>
 <!-- FastClick -->
-<script src="/thmz/js/fastclick.js"></script>
+<script src="/thmz/js/dependent/fastclick.js"></script>
 <!-- 进度条 -->
-<script src="/thmz/js/nprogress.js"></script>
+<script src="/thmz/js/dependent/nprogress.js"></script>
 <!-- jQuery custom content scroller -->
-<script src="/thmz/js/jquery.mCustomScrollbar.concat.min.js"></script>
+<script src="/thmz/js/dependent/jquery.mCustomScrollbar.concat.min.js"></script>
 <!--数据校验-->
-<script src="/thmz/js/validator.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
 <!--文件上传-->
-<script src="/thmz/js/dropzone.min.js"></script>
-<script src="/thmz/js/bootstrap-table.min.js"></script>
-<script src="/thmz/js/bootstrap-table-zh-CN.min.js"></script>
-<script src="/thmz/js/bootstrap-datetimepicker.min.js"></script>
-<script src="/thmz/js/bootstrap-datetimepicker.zh-CN.js"></script>
+<script src="/thmz/js/dependent/dropzone.min.js"></script>
+<script src="/thmz/js/dependent/bootstrap-table.min.js"></script>
+<script src="/thmz/js/dependent/bootstrap-table-zh-CN.min.js"></script>
+<script src="/thmz/js/dependent/bootstrap-datetimepicker.min.js"></script>
+<script src="/thmz/js/dependent/bootstrap-datetimepicker.zh-CN.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/js/common/string-util.js"></script>
 <script src="/thmz/js/common/pad-util.js"></script>
 <script src="/thmz/js/common/math.js"></script>
 <!-- Custom Theme Scripts -->
-<script src="/thmz/js/custom-from-min.js"></script>
+<script src="/thmz/js/dependent/custom-from-min.js"></script>
 <script src="/thmz/js/menu.js"></script>
-<script src="/thmz/js/fcode.js"></script>
-<script src="/thmz/js/message.js"></script>
+<script src="/thmz/js/dependent/fcode.js"></script>
+<script src="/thmz/js/common/message.js"></script>
 <!--弹窗-->
 <script src="/thmz/js/pnotify/pnotify.js"></script>
 <script src="/thmz/js/pnotify/pnotify.buttons.js"></script>
 <script src="/thmz/js/pnotify/pnotify.nonblock.js"></script>
 <!-- Switchery -->
-<script src="/thmz/js/switchery.min.js"></script>
+<script src="/thmz/js/dependent/switchery.min.js"></script>
 </body>
 </html>

src/main/resources/templates/menu_manage.html

@@ -2,7 +2,7 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/js/menu_manage.js"></script>
 <title>菜单管理页面</title>

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

@@ -2,8 +2,8 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/excel/table2excel.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/js/mz/bissinessReport.js"></script>

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

@@ -2,8 +2,8 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/js/excel/table2excel.js"></script>
 <script src="/thmz/js/mz/cash_work_count.js"></script>

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

@@ -1,6 +1,6 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/validator.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
 <script src="/thmz/js/common/map-util.js"></script>
 <script src="/thmz/js/mz/charge_detail.js"></script>
 <title>收费项目字典维护</title>

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

@@ -2,10 +2,10 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/mz/charge_list.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>病人费用清单</title>
 <!-- 打印的样式-->
 <style media="print">

src/main/resources/templates/daily.html → src/main/resources/templates/mz/daily.html

@@ -2,10 +2,10 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/daily.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/daily.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>日结处理页面</title>
 <!-- 打印的样式-->
 <style media="print">

src/main/resources/templates/daily_collect.html → src/main/resources/templates/mz/daily_collect.html

@@ -2,11 +2,11 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
-<script src="/thmz/js/daily_collect.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/mz/daily_collect.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>日结汇总页面</title>
 <!-- 打印的样式-->
 <style media="print">

src/main/resources/templates/daily_repeat_print.html → src/main/resources/templates/mz/daily_repeat_print.html

@@ -2,11 +2,11 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
-<script src="/thmz/js/daily_repeat_print.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/mz/daily_repeat_print.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>重打日结报表页面</title>
 <!-- 打印的样式-->
 <style media="print">

src/main/resources/templates/data_util.html → src/main/resources/templates/mz/data_util.html

@@ -2,9 +2,9 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/data_util.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/data_util.js"></script>
 <title>数据修复工具</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/mzhbtj.html → src/main/resources/templates/mz/mzhbtj.html

@@ -2,10 +2,10 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
 <script src="/thmz/js/excel/table2excel.js"></script>
-<script src="/thmz/js/mzhbtj.js"></script>
+<script src="/thmz/js/mz/mzhbtj.js"></script>
 <title>门诊号别统计</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/mzsrmx.html → src/main/resources/templates/mz/mzsrmx.html

@@ -2,9 +2,9 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/mzsrmx.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/mzsrmx.js"></script>
 <title>门诊收入明细</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/print_config.html → src/main/resources/templates/mz/print_config.html

@@ -1,7 +1,7 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
-<script src="/thmz/js/print_config.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
+<script src="/thmz/js/mz/print_config.js"></script>
 <title>打印机设置页面</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/refund_medicine.html → src/main/resources/templates/mz/refund_medicine.html

@@ -1,9 +1,9 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/refund_medicine.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/refund_medicine.js"></script>
 <title>退药申请</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/registration.html → src/main/resources/templates/mz/registration.html

@@ -4,17 +4,17 @@
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/jquery.webui-popover.min.css">
 <link rel="stylesheet" href="/thmz/css/registration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/icheck.js"></script>
-<script src="/thmz/js/jquery.webui-popover.min.js"></script>
-<script src="/thmz/js/validator.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/icheck.js"></script>
+<script src="/thmz/js/dependent/jquery.webui-popover.min.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <script src="/thmz/js/jBox/jquery.jBox-2.3.min.js"></script>
 <script src="/thmz/js/jBox/baseISSObject.js"></script>
 <script src="/thmz/js/jBox/baseISSOnline.js"></script>
 <script src="/thmz/js/jBox/common.js"></script>
-<script src="/thmz/js/registration.js"></script>
+<script src="/thmz/js/mz/registration.js"></script>
 <title>挂号管理</title>
 <style>
     .thmz_alert .alert::after {

src/main/resources/templates/registration_list.html → src/main/resources/templates/mz/registration_list.html

@@ -4,13 +4,13 @@
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/jquery.webui-popover.min.css">
 <link rel="stylesheet" href="/thmz/css/registration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/icheck.js"></script>
-<script src="/thmz/js/jquery.webui-popover.min.js"></script>
-<script src="/thmz/js/validator.js"></script>
-<script src="/thmz/js/registration_list.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/icheck.js"></script>
+<script src="/thmz/js/dependent/jquery.webui-popover.min.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
+<script src="/thmz/js/mz/registration_list.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>挂号列表</title>
 <style>
     .thmz_alert .alert::after {

src/main/resources/templates/request-config.html → src/main/resources/templates/mz/request-config.html

@@ -2,8 +2,8 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css"/>
 <link rel="stylesheet" href="/thmz/css/toll_administration.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/request-config.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/mz/request-config.js"></script>
 <title>号表预警设置页面</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/request.html → src/main/resources/templates/mz/request.html

@@ -2,9 +2,9 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/request.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/request.js"></script>
 <title>号表维护</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/request_holidays_config.html → src/main/resources/templates/mz/request_holidays_config.html

@@ -2,8 +2,8 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css"/>
 <link rel="stylesheet" href="/thmz/css/toll_administration.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/request-holidays-config.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/mz/request-holidays-config.js"></script>
 <title>节假日管理</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/request_type.html → src/main/resources/templates/mz/request_type.html

@@ -2,9 +2,9 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/request_type.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/request_type.js"></script>
 <title>号别类型</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/schedule-of-medical-apply.html → src/main/resources/templates/mz/schedule-of-medical-apply.html

@@ -2,10 +2,10 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/schedule-of-medical-apply.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/schedule-of-medical-apply.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>医技申请</title>
 <!-- 打印的样式-->
 <style media="print">

src/main/resources/templates/schedule-of-medical.html → src/main/resources/templates/mz/schedule-of-medical.html

@@ -2,9 +2,9 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/schedule-of-medical.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/schedule-of-medical.js"></script>
 <title>医技预约配置</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/to-medicine.html → src/main/resources/templates/mz/to-medicine.html

@@ -2,9 +2,9 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css"/>
 <link rel="stylesheet" href="/thmz/css/toll_administration.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/jquery.thooClock.js"></script>
-<script src="/thmz/js/to-medicine.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/jquery.thooClock.js"></script>
+<script src="/thmz/js/mz/to-medicine.js"></script>
 <title>发药提醒</title>
 <style>
     tr{

src/main/resources/templates/toll_administration.html → src/main/resources/templates/mz/toll_administration.html

@@ -2,10 +2,10 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/toll_administration.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/mz/toll_administration.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>收费管理</title>
 <!-- 打印的样式-->
 <style media="print">

src/main/resources/templates/unit_code.html → src/main/resources/templates/mz/unit_code.html

@@ -1,7 +1,7 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/validator.js"></script>
-<script src="/thmz/js/unit_code.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
+<script src="/thmz/js/mz/unit_code.js"></script>
 <title>科室列表</title>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12">

src/main/resources/templates/role_manage.html

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
 <link rel="stylesheet" href="/thmz/zTree_v3/css/zTreeStyle/zTreeStyle.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/zTree_v3/js/jquery.ztree.all.js" type="text/javascript" charset="utf-8"></script>
 <script src="/thmz/js/role_manage.js"></script>

src/main/resources/templates/sfy_config.html

@@ -1,6 +1,6 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-select.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <script src="/thmz/js/sfy_config.js"></script>
 <title>收费员设置</title>
 <div class="row">

src/main/resources/templates/user_manage.html

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
 <link rel="stylesheet" href="/thmz/zTree_v3/css/zTreeStyle/zTreeStyle.css"/>
-<script src="/thmz/js/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/zTree_v3/js/jquery.ztree.all.js" type="text/javascript" charset="utf-8"></script>
 <script src="/thmz/js/user_manage.js"></script>

src/main/resources/templates/user_menu_relation.html

@@ -3,7 +3,7 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-treeview.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
 <script src="/thmz/js/common/date-util.js"></script>
 <script src="/thmz/js/bootstrap-treeview.js"></script>
 <script src="/thmz/js/user_menu_relation.js"></script>

src/main/resources/templates/zy/accepting.html

@@ -4,12 +4,12 @@
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/jquery.webui-popover.min.css">
 <link rel="stylesheet" href="/thmz/css/registration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/icheck.js"></script>
-<script src="/thmz/js/jquery.webui-popover.min.js"></script>
-<script src="/thmz/js/validator.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/icheck.js"></script>
+<script src="/thmz/js/dependent/jquery.webui-popover.min.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <script src="/thmz/js/jBox/jquery.jBox-2.3.min.js"></script>
 <script src="/thmz/js/jBox/baseISSObject.js"></script>
 <script src="/thmz/js/jBox/baseISSOnline.js"></script>

src/main/resources/templates/zy/actpatient.html

@@ -2,11 +2,11 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/daterangepicker.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/toll_administration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/daterangepicker.zh-CN.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.zh-CN.js"></script>
 <script src="/thmz/js/zy/actpatient.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <title>住院病人列表</title>
 <!-- 打印的样式-->
 <style media="print">

src/main/resources/templates/hospitalized.html → src/main/resources/templates/zy/hospitalized.html

@@ -4,17 +4,17 @@
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/jquery.webui-popover.min.css">
 <link rel="stylesheet" href="/thmz/css/registration.css">
-<script src="/thmz/js/bootstrap-select.js"></script>
-<script src="/thmz/js/daterangepicker.js"></script>
-<script src="/thmz/js/icheck.js"></script>
-<script src="/thmz/js/jquery.webui-popover.min.js"></script>
-<script src="/thmz/js/validator.js"></script>
-<script src="/thmz/js/LodopFuncs.js"></script>
+<script src="/thmz/js/dependent/bootstrap-select.js"></script>
+<script src="/thmz/js/dependent/daterangepicker.js"></script>
+<script src="/thmz/js/dependent/icheck.js"></script>
+<script src="/thmz/js/dependent/jquery.webui-popover.min.js"></script>
+<script src="/thmz/js/dependent/validator.js"></script>
+<script src="/thmz/js/dependent/LodopFuncs.js"></script>
 <script src="/thmz/js/jBox/jquery.jBox-2.3.min.js"></script>
 <script src="/thmz/js/jBox/baseISSObject.js"></script>
 <script src="/thmz/js/jBox/baseISSOnline.js"></script>
 <script src="/thmz/js/jBox/common.js"></script>
-<script src="/thmz/js/hospitalized.js"></script>
+<script src="/thmz/js/zy/hospitalized.js"></script>
 <title>入院登记</title>
 <style>
     .thmz_alert .alert::after {