LIJU 1 mesiac pred
rodič
commit
1368883aef

+ 1 - 1
src/main/resources/static/js/common/pharmacy-com.js

@@ -662,7 +662,7 @@ function readcardRequest(config) {
     return new Promise(((resolve, reject) => {
         $.ajax({
             type: config.method,
-            url: readcardUrl,
+            url: config.data && config.data.param && config.data.param ==='jiangsu_qrcode_01302' ? 'http://localhost:8321/api/entry' : readcardUrl,
             data: config.data,
             contentType: "application/json;charset=UTF-8",
             dataType: "json",

+ 9 - 5
src/main/resources/static/js/mz/clinic.js

@@ -917,7 +917,8 @@ $(function () {
      * 医保电子凭证读卡
      */
     $("#siReadCard").on("click", function (t) {
-        siReadCard("qrcode_01101");
+        // siReadCard("qrcode_01101");
+        siReadCard("jiangsu_qrcode_01101");
     });
 
 
@@ -940,6 +941,7 @@ $(function () {
      */
     // $("#mztczfSiReadCard").on("click", function (t) {
     //     mztczfSiReadCard(true, "qrcode_01101");
+    //     mztczfSiReadCard(true, "jiangsu_qrcode_01101");
     // });
 
     /**
@@ -2537,7 +2539,8 @@ var visitMtCardResult = null;
 function readVisitPatientCard() {
     $.ajax({
         type: "GET",
-        url: 'http://localhost:8321/readcard/entry?param=qrcode_01101',
+        // url: 'http://localhost:8321/readcard/entry?param=qrcode_01101',
+        url: 'http://localhost:8321/api/entry?param=jiangsu_qrcode_01101',
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -2690,7 +2693,7 @@ function mztczfSiReadCard(asyncFlag, params) {
     mztczfSiReadCardStatus = true;
     $.ajax({
         type: "GET",
-        url: 'http://localhost:8321/readcard/entry?param=' + params,
+        url: params && params === 'jiangsu_qrcode_01101' ? 'http://localhost:8321/api/entry?param=jiangsu_qrcode_01101' :'http://localhost:8321/readcard/entry?param=' + params,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         async: asyncFlag,
@@ -10686,7 +10689,8 @@ function savePrescriptionForReadCard(wpMedicineFlag) {
                             $("#messageModalYb").modal();
                             $("#messageContent").html("门诊统筹处方必须读卡,是否立即读卡?");
                             $("#ybdzpz").off("click").bind("click", function (t) {
-                                mztczfSiReadCard(true, "qrcode_01101");
+                                // mztczfSiReadCard(true, "qrcode_01101");
+                                mztczfSiReadCard(true, "jiangsu_qrcode_01101");
                                 realSavePrescription(wpMedicineFlag,false);
                             });
                             $("#ybsl").off("click").bind("click", function (t) {
@@ -14049,7 +14053,7 @@ function setOtherEmrProcess() {
 function siReadCard(params) {
     $.ajax({
         type: "GET",
-        url: 'http://localhost:8321/readcard/entry?param=' + params,
+        url: params && params === 'jiangsu_qrcode_01101' ? 'http://localhost:8321/api/entry?param=jiangsu_qrcode_01101' :'http://localhost:8321/readcard/entry?param=' + params,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},

+ 2 - 1
src/main/resources/static/js/mz/pharmacy-cell.js

@@ -74,7 +74,8 @@ $(function () {
         readcardRequest({
             method: 'get',
             data: {
-                param: 'qrcode_01302'
+                // param: 'qrcode_01302'
+                param: 'jiangsu_qrcode_01302'
             }
         }).then((res)=>{
             console.log(res.data);

+ 3 - 2
src/main/resources/static/js/mz/registration.js

@@ -163,7 +163,8 @@ $(function () {
      * 医保电子凭证读卡
      */
     $("#siReadCard").on("click", function (t) {
-        siReadCard("qrcode_01101");
+        // siReadCard("qrcode_01101");
+        siReadCard("jiangsu_qrcode_01101");
     });
 
     /**
@@ -1790,7 +1791,7 @@ function clearParams() {
 function siReadCard(params) {
     $.ajax({
         type: "GET",
-        url: 'http://localhost:8321/readcard/entry?param='+params,
+        url: params && params === 'jiangsu_qrcode_01101' ? 'http://localhost:8321/api/entry?param=jiangsu_qrcode_01101' :'http://localhost:8321/readcard/entry?param=' + params,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},

+ 8 - 4
src/main/resources/static/js/mz/toll_administration.js

@@ -71,7 +71,8 @@ $(function () {
      * 医保电子凭证读卡
      */
     $("#siReadCard").on("click", function (t) {
-        siReadCard("qrcode_01101");
+        // siReadCard("qrcode_01101");
+        siReadCard("jiangsu_qrcode_01101");
     });
 
     /**
@@ -813,8 +814,10 @@ function reSiReadCard(asyncFlag,tfReadType) {
         // 江苏医保读取社保卡使用专用地址
         url = 'http://localhost:8321/readcard/jiangsu/readcard_auto';
     }else if(tfReadType == '01'){
-        params ='qrcode_01101';
-        url = 'http://localhost:8321/readcard/entry?param=' + params;
+        // params ='qrcode_01101';
+        params ='jiangsu_qrcode_01101';
+        // url = 'http://localhost:8321/readcard/entry?param=' + params;
+        url = 'http://localhost:8321/api/entry?param=' + params;
     }else if(tfReadType =='02'){
         // params ='idcard_01101'
         params ='huashi_readcard';
@@ -3167,7 +3170,7 @@ function clearEditPayMode() {
 function siReadCard(params) {
     $.ajax({
         type: "GET",
-        url: 'http://localhost:8321/readcard/entry?param='+params,
+        url: params && params === 'jiangsu_qrcode_01101' ? 'http://localhost:8321/api/entry?param=jiangsu_qrcode_01101' :'http://localhost:8321/readcard/entry?param=' + params,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -3226,6 +3229,7 @@ function mztczfSiReadCardTypeChange() {
             if (mztczfSiReadCardType == "03") {
                 url += 'sicard_01101';
             } else if (mztczfSiReadCardType == "01") {
+                // url += 'jiangsu_qrcode_01101';
                 url += 'qrcode_01101';
             } else if (mztczfSiReadCardType == "02") {
                 // url += 'idcard_01101';

+ 3 - 2
src/main/resources/static/js/zy/hospitalized.js

@@ -37,7 +37,8 @@ $(function () {
      * 医保电子凭证读卡
      */
     $("#siReadCard").on("click", function (t) {
-        siReadCard("qrcode_01101");
+        // siReadCard("qrcode_01101");
+        siReadCard("jiangsu_qrcode_01101");
     });
 
     /**
@@ -1666,7 +1667,7 @@ function initCertificateTypeSelect() {
 function siReadCard(params) {
     $.ajax({
         type: "GET",
-        url: 'http://localhost:8321/readcard/entry?param='+params,
+        url: params && params === 'jiangsu_qrcode_01101' ? 'http://localhost:8321/api/entry?param=jiangsu_qrcode_01101' :'http://localhost:8321/readcard/entry?param=' + params,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},