Merge remote-tracking branch 'upstream/dev-1.1.4' into dev-1.1.4

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

@@ -21,6 +21,10 @@ public class Windows {
     private Integer zyPrintIndex;
     //默认常规打印机下标 一般用途打印机
     private Integer cgPrintIndex;
+    //普通住院腕带打印机
+    private Integer normalWristStrapPrintIndex;
+    //儿童住院腕带打印机
+    private Integer childWristStrapPrintIndex;
     //用户id
     private String userIdCode;
     //ip地址 mac地址

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

@@ -10,8 +10,13 @@ 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,client_ip_address,mis_pos_router_code) 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},#{misPosRouterCode,jdbcType=VARCHAR})")
+    @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,mis_pos_router_code,normal_wrist_strap_print_index,child_wrist_strap_print_index) " +
+            "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}," +
+            "#{misPosRouterCode,jdbcType=VARCHAR},#{normalWristStrapPrintIndex,jdbcType=INTEGER},#{childWristStrapPrintIndex,jdbcType=INTEGER})")
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
     int insertUser(Windows windows);
 
@@ -22,7 +27,9 @@ 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,client_ip_address,mis_pos_router_code from t_windows where user_id_code= #{userIdCode,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,mis_pos_router_code,normal_wrist_strap_print_index,child_wrist_strap_print_index " +
+            "from t_windows where user_id_code= #{userIdCode,jdbcType=VARCHAR} " +
             "order by create_date desc limit 1",
             "</script>"})
     Windows selectLastWindowsByUserIdCode(@Param("userIdCode") String userIdCode);
@@ -35,7 +42,9 @@ 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,client_ip_address,mis_pos_router_code 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,mis_pos_router_code,normal_wrist_strap_print_index,child_wrist_strap_print_index " +
+            "from t_windows where ip_address= #{ipAddress,jdbcType=VARCHAR} " +
             "order by create_date desc limit 1",
             "</script>"})
     Windows selectLastWindowsByIpAddress(@Param("ipAddress") String ipAddress);
@@ -64,6 +73,12 @@ public interface WindowsMapper {
             "<when test='cgPrintIndex!=null'>",
             ",cg_print_index=#{cgPrintIndex,jdbcType=INTEGER}",
             "</when>",
+            "<when test='normalWristStrapPrintIndex!=null'>",
+            ",normal_wrist_strap_print_index=#{normalWristStrapPrintIndex,jdbcType=INTEGER}",
+            "</when>",
+            "<when test='childWristStrapPrintIndex!=null'>",
+            ",child_wrist_strap_print_index=#{childWristStrapPrintIndex,jdbcType=INTEGER}",
+            "</when>",
             "<when test='ipAddress!=null'>",
             ",ip_address=#{ipAddress}",
             "</when>",

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

@@ -4,14 +4,12 @@ var printSucess = false;
 var deptNoSucess = false;
 $(function () {
 
-
     $(".selectpicker").selectpicker({
         dropuAuto: false
     });
     //延迟触发列表加载，因为一开始打印程序还没有加载成功
     setTimeout('createPrinterList()', 500);
 
-
     $.ajax({
         type: "GET",
         contentType: "application/json;charset=UTF-8",
@@ -42,7 +40,6 @@ $(function () {
 
     delay(getLastWindowsByCurrentUser);
 
-
     /**
      * 提交按钮点击事件
      */
@@ -58,6 +55,8 @@ $(function () {
                 "printIndex": $("#printSelect").val(),
                 "cgPrintIndex": $("#printSelect_cg").val(),
                 "zyPrintIndex": $("#printSelect_zy").val(),
+                "normalWristStrapPrintIndex": $("#printSelect_normal_wrist_strap").val(),
+                "childWristStrapPrintIndex": $("#printSelect_child_wrist_strap").val(),
                 "clientIpAddress": $("#client_ip_address").val(),
                 "misPosRouterCode": $("#mis_pos_router_code").val()
             }),
@@ -139,6 +138,15 @@ function getLastWindowsByCurrentUser() {
                     $('#printSelect_cg').selectpicker('val', result.data.cgPrintIndex);
                     $('#printSelect_cg').selectpicker('refresh');
                 }
+
+                if (result.data.normalWristStrapPrintIndex != null) {
+                    $('#printSelect_normal_wrist_strap').selectpicker('val', result.data.normalWristStrapPrintIndex);
+                    $('#printSelect_normal_wrist_strap').selectpicker('refresh');
+                }
+                if (result.data.childWristStrapPrintIndex != null) {
+                    $('#printSelect_child_wrist_strap').selectpicker('val', result.data.childWristStrapPrintIndex);
+                    $('#printSelect_child_wrist_strap').selectpicker('refresh');
+                }
                 if (result.data.deptNo != null) {
                     $('#deptNoSelect').selectpicker('val', result.data.deptNo);
                     $('#deptNoSelect').selectpicker('refresh');
@@ -186,6 +194,10 @@ function createPrinterList() {
     $('#printSelect_zy').selectpicker('refresh');
     $('#printSelect_cg').html(html);
     $('#printSelect_cg').selectpicker('refresh');
+    $('#printSelect_normal_wrist_strap').html(html);
+    $('#printSelect_normal_wrist_strap').selectpicker('refresh');
+    $('#printSelect_child_wrist_strap').html(html);
+    $('#printSelect_child_wrist_strap').selectpicker('refresh');
     printSucess = true;
 }
 

src/main/resources/static/js/zy/hospitalized.js

@@ -3,6 +3,8 @@
 var LODOP; //声明为全局变量
 //默认打印机下标
 var printIndex = -1;
+var normalWristStrapPrintIndex = -1;
+var childWristStrapPrintIndex = -1;
 
 var smallDeptDict = {};
 
@@ -10,7 +12,6 @@ $(function () {
     initMaritalStatusSelect();
     initGenderSelect();
     initCertificateTypeSelect();
-
     //设置挂号窗口的高度
     var width = $('#confirmFee').css("width");
     var widthNum = parseInt(width);
@@ -617,6 +618,8 @@ function setPrint() {
             }
             if (res.code == 0) {
                 printIndex = res.data.printIndex;
+                normalWristStrapPrintIndex = res.data.normalWristStrapPrintIndex;
+                childWristStrapPrintIndex = res.data.childWristStrapPrintIndex;
             } else {
                 printIndex = -1;
             }
@@ -1465,25 +1468,30 @@ function copyAddress() {
 }
 
 function printWristStrap() {
+    setPrint();
     var patNo = $("#admissionNumber").val()
     if (!patNo) {
-        errorMesageSimaple('住院号不能为空！')
+        errorMesageSimaple('患者住院号不能为空！')
         return
     }
     var phone =  $("#contractPhone").val();
     if (!phone) {
         phone = $("#phoneNum").val()
     }
+    var age = $("#age").val();
+    if (!age) {
+        errorMesageSimaple('患者年龄不能为空！')
+    }
     LODOP = getLodop();
     LODOP.PRINT_INIT('inpatient_wrist_strap')
-    LODOP.SET_PRINTER_INDEX('DASCOM DL-520Z')
+    LODOP.SET_PRINTER_INDEX(age >= 12 ? normalWristStrapPrintIndex : childWristStrapPrintIndex);
     LODOP.SET_PRINT_PAGESIZE(2, 0, 0, '')
     LODOP.SET_PRINT_STYLE('FontSize', 9)
     LODOP.SET_PRINT_STYLE('Bold', 1)
 
     LODOP.ADD_PRINT_BARCODE('7mm', '30mm', '18.5mm', '18.5mm', 'QRCode', patNo)
 
-    LODOP.ADD_PRINT_TEXT('8mm', '50mm', '220mm', '7mm', '姓名：' + $("#userName").val() + ' / 性别：' + filterGender() + ' / 年龄：' + $("#age").val())
+    LODOP.ADD_PRINT_TEXT('8mm', '50mm', '220mm', '7mm', '姓名：' + $("#userName").val() + ' / 性别：' + filterGender() + ' / 年龄：' + age)
     LODOP.ADD_PRINT_TEXT('14mm', '50mm', '220mm', '7mm', '入院科室：' + smallDeptDict[$("#smallWard").val()])
     LODOP.ADD_PRINT_TEXT('20mm', '50mm', '220mm', '7mm', '紧急联系人：' + phone)
 

src/main/resources/templates/sfy_config.html

@@ -62,6 +62,20 @@
                             </select>
                         </div>
                     </div>
+                    <div class="item form-group">
+                        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="printSelect_cg">普通住院腕带打印机名称</label>
+                        <div class="col-md-4 col-sm-4 col-xs-12">
+                            <select class="form-control selectpicker show-tick" required="required" id="printSelect_normal_wrist_strap">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="printSelect_cg">儿童住院腕带打印机名称</label>
+                        <div class="col-md-4 col-sm-4 col-xs-12">
+                            <select class="form-control selectpicker show-tick" required="required" id="printSelect_child_wrist_strap">
+                            </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>