fix(settlement): 修复省外异地患者结算问题

- 修改患者信息接口 URL
- 增加日志输出以便调试
- 优化读卡组件加载状态管理
- 修正异地患者个人账户支付逻辑

.env.development

@@ -8,12 +8,12 @@ NODE_ENV = 'development'
 VUE_APP_BASE_API = ''
 # VUE_APP_BASE_URL = 'http://192.169.24.231:8002'
 # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
-# VUE_APP_BASE_URL = 'http://10.10.40.69:9903'
+VUE_APP_BASE_URL = 'http://10.10.40.69:9903'
 VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
 # VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
-VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
+# VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
 # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
-VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802'
+VUE_APP_BASE_URL_SFC = 'http://10.10.40.69:9903'
 # VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902'
 # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
 # VUE_APP_BASE_URL = 'http://10.10.40.10:8099'

src/api/jiesuan.js

@@ -263,6 +263,7 @@ export function hisybbalance (data) {
     })
 }
 export function patient (data) {
+    console.log(data,'ppppppppppppppppppp')
     return request({
         // url: `${Vue.prototype.$api.jiesuan.settlementPre}/${patient_id}`,
         url: `/api/patient/${data.card_no}`,

src/api/jiesuanSFC.js

@@ -264,9 +264,10 @@ export function hisybbalance (data) {
     })
 }
 export function patient (data) {
+    console.log(data,'ppppppppppppppppppp')
     return requestSFC({
         // url: `${Vue.prototype.$api.jiesuan.settlementPre}/${patient_id}`,
-        url: `/api/patient/${data.card_no}`,
+        url: `/api/patient/${data.id_card}`,
         method: 'get',
         params:data
     })

src/components/ReadcardsNewSFC/index.vue

@@ -306,6 +306,7 @@ export default {
                     // 读取M1卡
                     if (data) {
                         if (data?.RespData) {
+                            this.jiezhiLoading=true
                             this.PatientInfo = data.RespData
                             this.form.physicalCardType = 'HOSPITAL_CARD'
                             if (data.RespData?.AsciiData) {
@@ -323,6 +324,7 @@ export default {
                     // 读取身份证号
                     if (data) {
                         if (data?.RespData) {
+                            this.jiezhiLoading=true
                             this.PatientInfo = data.RespData
                             this.form.physicalCardType = 'ID_CARD'
 
@@ -343,6 +345,7 @@ export default {
                     // 读取社保卡
                     if (data) {
                         if (data?.RespData) {
+                            this.jiezhiLoading=true
                             this.PatientInfo = data.RespData
                             this.form.physicalCardType = 'ID_CARD'
                             if (data.RespData?.CardNo) {

src/components/ReadcardsSFC/index.vue

@@ -10,7 +10,7 @@
           @change="handleSelect">
           <el-option v-for="(item, i) in DiagnosisCardOptions" :key="i" :label="item.name" :value="item.code" />
         </el-select> -->
-        <el-form  element-loading-text="刷卡中，请稍后" element-loading-spinner="el-icon-loading" @submit.native.prevent>
+        <el-form  element-loading-text="刷卡中，请稍后" element-loading-spinner="el-icon-loading" @submit.native.prevent  v-loading="jiezhiLoading">
           <el-form-item>
             <el-input ref="cardInput" v-model.trim="form.physicalCard" style="width: 282px;margin-left: 10px; "
               placeholder="请输入卡号" @blur="handleSetFocus()" @keyup.enter.native="handleEnterModal()" />
@@ -37,6 +37,7 @@ export default {
   },
   data() {
     return {
+      jiezhiLoading:false,
       listinfo:{
         type:'',
 
@@ -61,7 +62,7 @@ export default {
         this.isOpenCardeds = v
         if (v === true) {
           this.$nextTick(() => {
-
+            this.jiezhiLoading=false
             this.form.physicalCard = ''
             this.form={}
             this.$refs.cardInput.focus()
@@ -108,6 +109,7 @@ export default {
     },
     // 输入框回车事件
     handleEnterModal() {
+       this.jiezhiLoading = true
     if(this.form.physicalCard.toString().length === 11){
         this.form.physicalCard= this.form.physicalCard.substring(3)
         this.form.physicalCardType = 'PATIENT_ID'
@@ -238,6 +240,7 @@ export default {
           // 读取M1卡
           if (data) {
             if (data?.RespData) {
+               this.jiezhiLoading=true
               this.PatientInfo = data.RespData
               this.form.physicalCardType = 'HOSPITAL_CARD'
               if (data.RespData?.AsciiData) {
@@ -257,6 +260,7 @@ export default {
           // 读取身份证号
           if (data) {
             if (data?.RespData) {
+              this.jiezhiLoading=true
               this.PatientInfo = data.RespData
               this.form.physicalCardType = 'ID_CARD'
               if (data.RespData?.CardId) {
@@ -275,6 +279,7 @@ export default {
           // 读取社保卡
           if (data) {
             if (data?.RespData) {
+              this.jiezhiLoading=true
               this.PatientInfo = data.RespData
               this.form.physicalCardType = 'SOCIAL_CARD'
               if (data.RespData?.CardNo) {

src/views/jiesuan/outpatientCharging.vue

@@ -2582,14 +2582,21 @@ export default {
                             this.bxxxinfo.grzhzf = djf
                              if (this.bxxxinfo.personal_pay_syd * 1 != 0) {
                                  this.bxxxinfo.grzhzf = this.bxxxinfo.personal_pay_syd
-
                              }
+                             if (this.form.insurance_type == 'LONGDISTANCE' &&this.bxxxinfo.personal_pay_syd * 1 == 0) {
+                                this.bxxxinfo.grzhzf = 0
+                            }
+
                         }
                         if (this.bxxxinfo.personal_balance < djf) {
                             this.bxxxinfo.grzhzf = this.bxxxinfo.personal_balance
+                               // 省外异地患者预结算异地不为0，个账为异地值，异地为0，个账为0
                               if (this.bxxxinfo.personal_pay_syd * 1 != 0) {
                                  this.bxxxinfo.grzhzf = this.bxxxinfo.personal_pay_syd
                              }
+                                if (this.form.insurance_type == 'LONGDISTANCE' &&this.bxxxinfo.personal_pay_syd * 1 == 0) {
+                                this.bxxxinfo.grzhzf = 0
+                            }
                             // if (this.form.insurance_type == 'LONGDISTANCE') {
                             //     this.bxxxinfo.grzhzf = 0
                             // }