lihong 1 рік тому
батько
коміт
15b4b3e24f

+ 11 - 6
src/main/resources/static/js/mz/hybrid_test.js

@@ -48,13 +48,18 @@ $(function () {
         $("#cancelButton").off("click");
     });
 
-
+    /**
+     * 身份证读卡
+     */
+    $("#siReadIdCard").on("click", function (t) {
+        siReadIdCard("idcard_01101");
+    });
     //每隔三秒读一次身份证
-    setInterval(function () {
-        new Device().startFun();
-        // //默认光标在卡号输入框
-        // $("#cardNo").focus();
-    }, 3000);
+    // setInterval(function () {
+    //     new Device().startFun();
+    //     // //默认光标在卡号输入框
+    //     // $("#cardNo").focus();
+    // }, 3000);
 
 
     $("#idCard").change(function (e) {

+ 1 - 1
src/main/resources/static/js/zy/hospitalized.js

@@ -385,7 +385,7 @@ function formatCheck() {
 function queryUserInfoByCardNo() {
     var cardNo = $("#cardNo").val();
     var index = cardNo.indexOf("-");
-    if ((index > 0 && index == cardNo.length - 2) || cardNo.length == 8) {
+    if ((index > 0 && index == cardNo.length - 2) || cardNo.length == 8  || cardNo.length >= 7) {
         $("#cardNo").attr("title", cardNo);
         $.ajax({
             type: "GET",

+ 1 - 0
src/main/resources/templates/mz/hybrid_test.html

@@ -56,6 +56,7 @@
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12">
                     <div class="clearRegistrationDiv">
+                        <a id="siReadIdCard"><i class="fa fa-hand-o-right">&nbsp;身份证读卡</i></a>
                         <a id="hybirdTimeManager" onclick="hybirdTimeModal()"><i class="fa fa-cog">&nbsp;混检管数/时间设置</i></a>
                         <a id="creatHybird" onclick="hybirdTypeModal()"><i class="fa fa-eyedropper">&nbsp;创建混检主体</i></a>
                         <a onclick="addToList()" hidden id="editUser"><i class="fa fa-plus">&nbsp;添加至列表</i></a>

+ 1 - 1
src/main/resources/templates/zy/hospitalized.html

@@ -142,7 +142,7 @@
                         <div class="input-group demo2 input-group-own">
                             <input id="cardNo" class="form-control col-md-7 col-xs-12" type="text"
                                    data-validate-length-range="1,10"
-                                   placeholder="ID/卡号" required="required">
+                                   placeholder="ID/卡号/住院号" required="required">
                             <input type='text' class="form-control hide" id='patientId'/>
                             <span class="input-group-addon"><a href="#" style="cursor: default"><i
                                     class="fa fa-credit-card"></i></a></span>