收费参数设置增加评价器客户端配置，增加评价器默认访问页面

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

@@ -38,9 +38,8 @@ public class NavigationController {
      */
     @RequestMapping("/login/view")
     public String loginView(HttpServletRequest request) {
-        System.out.println(HttpUtil.getIPAddress(request)+"---------------------");
+        //System.out.println(HttpUtil.getIPAddress(request)+"---------------------");
         return "login";
-
     }
 
     /**
@@ -1023,4 +1022,16 @@ public class NavigationController {
         }
         return "mz/depart_workload_statistics";
     }
+
+
+    /**
+     * 打开评价器欢迎页面
+     *
+     * @return
+     */
+    @RequestMapping("/client/welcome")
+    public String clientWelcome() {
+        return "mz/client_welcome";
+    }
+
 }

src/main/java/cn/hnthyy/thmz/entity/thmz/Windows.java

@@ -29,4 +29,6 @@ public class Windows {
     private Date createDate;
     //当前设置的更新时间
     private Date updateDate;
+    //评价器客户端ip地址
+    private String clientIpAddress;
 }

src/main/java/cn/hnthyy/thmz/mapper/thmz/WindowsMapper.java

@@ -10,8 +10,8 @@ public interface WindowsMapper {
      * @param windows
      * @return
      */
-    @Insert("INSERT INTO t_windows(dept_no,windows_no,print_index,zy_print_index,cg_print_index,user_id_code,ip_address, create_date,update_date) VALUES " +
-            "(#{deptNo,jdbcType=VARCHAR},#{windowsNo,jdbcType=INTEGER},#{printIndex,jdbcType=INTEGER},#{zyPrintIndex,jdbcType=INTEGER},#{cgPrintIndex,jdbcType=INTEGER},#{userIdCode,jdbcType=VARCHAR},#{ipAddress,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})")
+    @Insert("INSERT INTO t_windows(dept_no,windows_no,print_index,zy_print_index,cg_print_index,user_id_code,ip_address, create_date,update_date,client_ip_address) VALUES " +
+            "(#{deptNo,jdbcType=VARCHAR},#{windowsNo,jdbcType=INTEGER},#{printIndex,jdbcType=INTEGER},#{zyPrintIndex,jdbcType=INTEGER},#{cgPrintIndex,jdbcType=INTEGER},#{userIdCode,jdbcType=VARCHAR},#{ipAddress,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP},#{clientIpAddress,jdbcType=VARCHAR})")
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
     int insertUser(Windows windows);
 
@@ -38,7 +38,7 @@ public interface WindowsMapper {
      * @return
      */
     @Select({"<script>",
-            "select id,dept_no,windows_no,print_index,zy_print_index,cg_print_index,user_id_code,ip_address, create_date,update_date from t_windows where ip_address= #{ipAddress,jdbcType=VARCHAR} " +
+            "select id,dept_no,windows_no,print_index,zy_print_index,cg_print_index,user_id_code,ip_address, create_date,update_date,client_ip_address from t_windows where ip_address= #{ipAddress,jdbcType=VARCHAR} " +
             "order by create_date desc limit 1",
             "</script>"})
     Windows selectLastWindowsByIpAddress(@Param("ipAddress") String ipAddress);
@@ -73,6 +73,9 @@ public interface WindowsMapper {
             "<when test='updateDate!=null'>",
             ",update_date=#{updateDate,jdbcType=TIMESTAMP}",
             "</when>",
+            "<when test='clientIpAddress!=null'>",
+            ",client_ip_address=#{clientIpAddress}",
+            "</when>",
             "</trim>",
             "</script>"})
     int updateWindows(Windows windows);

src/main/resources/static/js/common/socket-com.js

@@ -3,7 +3,7 @@ var prescriptionPrintWebsocket = null;
 var lockReconnect = false; //避免ws重复连接
 var lastPatient = '';
 var number = 0;//重连次数
-var ip = '172.16.32.160:81';
+var ip = '172.16.32.161:81';
 function openSocket(type) {
 //判断当前浏览器是否支持WebSocket
     try {

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

@@ -0,0 +1,6 @@
+
+$(function (){
+    $.backstretch("../../thmz/images/backgrounds/back3.jpg");
+});
+
+

src/main/resources/static/js/sfy_config.js

@@ -53,7 +53,7 @@ $(function (){
             contentType: "application/json;charset=UTF-8",
             url: "/thmz/saveWindows",
             dataType: 'json',
-            data: JSON.stringify({"deptNo": $("#deptNoSelect").val(),"windowsNo":$("#winNo").val(),"printIndex": $("#printSelect").val(),"cgPrintIndex": $("#printSelect_cg").val(),"zyPrintIndex": $("#printSelect_zy").val()}),
+            data: JSON.stringify({"deptNo": $("#deptNoSelect").val(),"windowsNo":$("#winNo").val(),"printIndex": $("#printSelect").val(),"cgPrintIndex": $("#printSelect_cg").val(),"zyPrintIndex": $("#printSelect_zy").val(),"clientIpAddress": $("#client_ip_address").val()}),
             headers:{'Accept': 'application/json','Authorization':'Bearer '+ localStorage.getItem("token")},
             success: function(result) {
                 if(result=='401' || result==401){
@@ -108,6 +108,7 @@ function getLastWindowsByCurrentUser() {
                     $('#deptNoSelect').selectpicker('val', result.data.deptNo);
                     $('#deptNoSelect').selectpicker('refresh');
                 }
+                $("#client_ip_address").val(result.data.clientIpAddress);
             } else {
                 errorMesage(result);
             }

src/main/resources/templates/login.html

@@ -39,7 +39,7 @@
                     <div class="description">
                         <p>
                             湖南泰和医院是一家省级直属三级综合学科医院，医保/农合定点，全国诚信标杆医院
-                            链接至<a href="http://www.thyy.cn/"><strong>医院首页</strong></a>，祝您工作愉快
+                            链接至<a href="http://192.168.200.4/"><strong>医院首页</strong></a>，祝您工作愉快
                         </p>
                     </div>
                 </div>

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

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <script th:replace="common/head::static"></script>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>泰和云HIS</title>
+
+    <!-- CSS -->
+    <!--<link rel="stylesheet" th:href="@{~/css/roboto.css}"/>-->
+    <link rel="stylesheet" href="/thmz/css/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/thmz/css/form-elements.css">
+    <link rel="stylesheet" href="/thmz/css/font-awesome/css/style.css">
+    <link rel="shortcut icon" type="image/x-icon" href="/thmz/images/hospital.png" />
+    <!-- Favicon and touch icons -->
+<!--    <link rel="shortcut icon" type="image/x-icon" href="@{~/ico/favicon.png">-->
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/thmz/ico/apple-touch-icon-144-precomposed.png">
+    <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/dependent/jquery.backstretch.min.js"></script>
+    <script src="/thmz/js/mz/client_welcome.js"></script>
+    <title>打开评价器欢迎页面</title>
+</head>
+
+<body>
+
+<!--<div class="col-sm-12 col-sm-12 col-xs-12">-->
+    <!--<img src="../../thmz/images/taihe-logo.png" style="height: 100px;background-color: white;float: left;margin-top: 20px;margin-left: 20px;" >-->
+    <!--<h2 style="margin-top: 45px;text-align: left;padding-left: 250px;font-weight: 500;color: white;font-family: SimSun;">用心服务 用爱沟通</h2>-->
+<!--</div>-->
+
+<div class="col-sm-12 col-sm-12 col-xs-12">
+    <img src="../../thmz/images/taihe-logo3.png" style="height: 100px;width:100px;float: left;margin-top: 20px;margin-left: 20px;border-radius: 50px;" >
+    <h2 style="margin-top: 45px;text-align: left;padding-left: 130px;font-weight: 500;color: white;font-family: SimSun;">用心服务 用爱沟通</h2>
+</div>
+<div class="col-sm-12 col-sm-12 col-xs-12" style="position: absolute;bottom: 10px;right: 10px;">
+    <h2 style="text-align: right;font-weight: 500;color: white;font-family: SimSun;/*text-shadow: 3px 3px 5px white; */">自强不息 厚德载物</h2>
+</div>
+</body>
+
+</html>

src/main/resources/templates/sfy_config.html

@@ -2,12 +2,12 @@
 <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>
+<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="x_title">
-                <h2>收费员参数设置<small id="titleInfo">修改</small></h2>
+                <h2>收费参数设置<small id="titleInfo">修改</small></h2>
                 <ul class="nav navbar-right panel_toolbox">
                     <!--    <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
                         </li>-->
@@ -22,7 +22,7 @@
             <div class="x_content">
 
                 <form class="form-horizontal form-label-left" novalidate id="sfy_config_form" autocomplete="off">
-                    <span class="section" style="font-size: 16px">收费员参数信息</span>
+                    <span class="section" style="font-size: 16px">收费参数信息</span>
                     <div class="item form-group">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="deptNoSelect">院区 <span class="required">*</span>
                         </label>
@@ -62,6 +62,13 @@
                             </select>
                         </div>
                     </div>
+                    <div class="item form-group">
+                        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="client_ip_address">评价器客户端IP地址
+                        </label>
+                        <div class="col-md-4 col-sm-4 col-xs-12">
+                            <input type="text" id="client_ip_address"  class="form-control col-md-7 col-xs-12">
+                        </div>
+                    </div>
                     <div class="ln_solid"></div>
                     <div class="form-group">
                         <div class="col-md-6 col-md-offset-3">