Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -80,12 +80,16 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="org_id == 10340">
+          <div v-if="org_id == 10454">
             <el-button  size="small"
-                        @click="openZb(4)"
+                        @click="openZb(1)"
                         v-if=" this.order.id == 0"
                         type="primary">记账
             </el-button>
+            <el-button   size="small"
+                         @click="openZb(2)"
+                         type="primary">撤销记账
+            </el-button>
           </div>
 
           <div  v-if="org_id != 10340">
@@ -99,10 +103,7 @@
             <!--                       type="primary">记账-->
             <!--            </el-button>-->
 
-            <!--            <el-button   size="small"-->
-            <!--                       @click="openZb(3)"-->
-            <!--                       type="primary">撤销记账-->
-            <!--            </el-button>-->
+
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
@@ -2889,179 +2890,29 @@ export default {
       }
     }, openZb(index) {
       switch (index) {
-        // case 1:
-        //   if(this.patientInfo.id == 0){
-        //     this.$message.error("请需要选择挂号的患者")
-        //     return
-        //   }
-        //   if(this.big_prescriptions.length == 0){
-        //     this.$message.error("处方不能为空")
-        //     return
-        //   }
-        //   if(this.form.diagnosis.length == 0){
-        //     this.$message.error("诊断不能为空")
-        //     return
-        //   }
-        //   var that = this
-        //   let obj = {
-        //     patient_id: this.patientInfo.id,
-        //     diagnosis_time: this.form.diagnosis_time,
-        //     record_date: this.record_date,
-        //     admin_user_id: this.$store.getters.xt_user.user.id,
-        //     org_id: this.$store.getters.xt_user.org_id
-        //
-        //   }
-        //   axios.get(process.env.BASE_API +'/coordinate/register', {
-        //     params: obj
-        //   })
-        //       .then(function(response) {
-        //         if (response.data.state == 0) {
-        //           that.$message.error(response.data.msg)
-        //           that.loadingtwo = false
-        //           return false
-        //         } else {
-        //           if (response.data.data.failed_code == -10) {
-        //             that.$confirm(response.data.data.msg, '医保错误信息', {
-        //               confirmButtonText: '确 定',
-        //               type: 'warning'
-        //             }).then(() => {
-        //
-        //             }).catch(() => {
-        //             })
-        //
-        //           } else {
-        //             that.radio = 1
-        //             that.changeRadioAndPatient(1)
-        //             that.$message({ message: '登记成功', type: 'success', duration: 5000 })
-        //           }
-        //
-        //         }
-        //       })
-        //       .catch(function(error) {
-        //
-        //       })
-        //
-        //   break
-        // case 2:
-        //   var that = this
-        //   var obj2 = {
-        //     id: this.patientInfo.id,
-        //     record_time: this.record_date,
-        //     his_patient_id: this.hisPatientInfo.id,
-        //     org_id: this.$store.getters.xt_user.org_id,
-        //     p_type:14,
-        //
-        //   }
-        //   obj2['diagnosis'] = this.form.diagnosis.join(',')
-        //   obj2['sick_type'] = this.form.sick_type
-        //   if (this.activeName == 'first') {
-        //     obj2['settle_accounts_type'] = 1
-        //   } else if (this.activeName == 'second') {
-        //     obj2['start_time'] = this.other_start_time
-        //     obj2['end_time'] = this.other_end_time
-        //     obj2['settle_accounts_type'] = 2
-        //   }
-        //   axios.get(process.env.BASE_API  + '/coordinate/opKeepAccounts', {
-        //     params: obj2
-        //   })
-        //       .then(function(response) {
-        //         if (response.data.state == 0) {
-        //           that.$message.error(response.data.msg)
-        //           that.loadingtwo = false
-        //           return false
-        //         } else {
-        //           if (response.data.data.failed_code == -10) {
-        //             that.$confirm(response.data.data.msg, '医保错误信息', {
-        //               confirmButtonText: '确 定',
-        //               type: 'warning'
-        //             }).then(() => {
-        //
-        //             }).catch(() => {
-        //             })
-        //
-        //           } else {
-        //             that.radio = 1
-        //             that.changeRadioAndPatient(1)
-        //             that.$message({ message: '记账成功', type: 'success', duration: 5000 })
-        //           }
-        //
-        //         }
-        //       })
-        //       .catch(function(error) {
-        //
-        //       })
-        //
-        //   break
-        // case 3:
-        //   var that = this
-        //   let obj3 = {
-        //     order_id:this.order.id,
-        //     admin_user_id: this.$store.getters.xt_user.user.id,
-        //     org_id: this.$store.getters.xt_user.org_id
-        //   }
-        //   axios.get(process.env.BASE_API + '/coordinate/opCancelKeepAccounts', {
-        //     params: obj3
-        //   })
-        //       .then(function(response) {
-        //         if (response.data.state == 0) {
-        //           that.$message.error(response.data.msg)
-        //           that.loadingtwo = false
-        //           return false
-        //         } else {
-        //           if (response.data.data.failed_code == -10) {
-        //             that.$confirm(response.data.data.msg, '医保错误信息', {
-        //               confirmButtonText: '确 定',
-        //               type: 'warning'
-        //             }).then(() => {
-        //
-        //             }).catch(() => {
-        //             })
-        //
-        //           } else {
-        //             that.radio = 1
-        //             that.changeRadioAndPatient(1)
-        //             that.$message({ message: '撤销记账成功', type: 'success', duration: 5000 })
-        //           }
-        //
-        //         }
-        //       })
-        //       .catch(function(error) {
-        //
-        //       })
-        //
-        //   break
-        case 4:
-          if(this.patientInfo.id == 0){
-            this.$message.error("请需要选择挂号的患者")
+        case 1:
+          if (this.patientInfo.id == 0) {
+            this.$message.error("请选择需要记账的患者")
             return
           }
-          if(this.big_prescriptions.length == 0){
+          if (this.prescriptions.length == 0) {
             this.$message.error("处方不能为空")
             return
           }
-          if(this.form.diagnosis.length == 0){
+          if (this.form.diagnosis.length == 0) {
             this.$message.error("诊断不能为空")
             return
           }
+          var that = this
           let obj = {
             patient_id: this.patientInfo.id,
             diagnosis_time: this.form.diagnosis_time,
             record_date: this.record_date,
             admin_user_id: this.$store.getters.xt_user.user.id,
-            his_patient_id: this.hisPatientInfo.id,
-            p_type:14
-          }
-          obj['diagnosis'] = this.form.diagnosis.join(',')
-          obj['sick_type'] = this.form.sick_type
-          if (this.activeName == 'first') {
-            obj['settle_accounts_type'] = 1
-          } else if (this.activeName == 'second') {
-            obj['start_time'] = this.other_start_time
-            obj['end_time'] = this.other_end_time
-            obj['settle_accounts_type'] = 2
+            org_id: this.$store.getters.xt_user.org_id
+
           }
-          var that = this
-          axios.get("http://127.0.0.1:9532"  + '/coordinate/settleAccount', {
+          axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount', {
             params: obj
           })
             .then(function(response) {
@@ -3082,7 +2933,7 @@ export default {
                 } else {
                   that.radio = 1
                   that.changeRadioAndPatient(1)
-                  that.$message({ message: '记账成功', type: 'success', duration: 5000 })
+                  that.$message({ message: '登记成功', type: 'success', duration: 5000 })
                 }
 
               }
@@ -3090,9 +2941,44 @@ export default {
             .catch(function(error) {
 
             })
-
           break
+        case 2:
+          var that = this
+          let obj3 = {
+            order_id:this.order.id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          }
+          axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount/cancel', {
+            params: obj3
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
+                } else {
+                  that.radio = 1
+                  that.changeRadioAndPatient(1)
+                  that.$message({ message: '撤销记账成功', type: 'success', duration: 5000 })
+                }
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+          break
       }
     },openZF(index){
 

src/xt_pages/user/Sitemap.vue

@@ -1127,65 +1127,92 @@ export default{
             // this.V_left = sitemap.v_left
             this.A_right = []
             
-            for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
+            if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
+              for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
              
-              sitemap.DeviceValsualALeft[i].markNum =  sitemap.DeviceValsualALeft[i].mark_num
+                sitemap.DeviceValsualALeft[i].markNum =  sitemap.DeviceValsualALeft[i].mark_num
 
-              this.A_right.push(sitemap.DeviceValsualALeft[i])
+                this.A_right.push(sitemap.DeviceValsualALeft[i])
+             }
             }
+          
 
             this.V_right = []
             
-            for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
+            if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
+              for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
              
-              sitemap.XtDeviceValsualVLeft[i].markNum =  sitemap.XtDeviceValsualVLeft[i].mark_num
+                sitemap.XtDeviceValsualVLeft[i].markNum =  sitemap.XtDeviceValsualVLeft[i].mark_num
 
-              this.V_right.push(sitemap.XtDeviceValsualVLeft[i])
+                this.V_right.push(sitemap.XtDeviceValsualVLeft[i])
+              }
             }
            
+           
             this.fuzhuA = []
-            for(let i=0;i<sitemap.DeviceValsualFuzhuA.length;i++){
+            if(sitemap.DeviceValsualFuzhuA!=null && sitemap.DeviceValsualFuzhuA.length>0){
+              for(let i=0;i<sitemap.DeviceValsualFuzhuA.length;i++){
                sitemap.DeviceValsualFuzhuA[i].a_markNum = sitemap.DeviceValsualFuzhuA[i].a_mark_num
               this.fuzhuA.push( sitemap.DeviceValsualFuzhuA[i])
             }
+            }
+           
            
             this.fuzhuV = []
-           for(let i=0;i<sitemap.DeviceValsualFuzhuV.length;i++){
-             sitemap.DeviceValsualFuzhuV[i].v_markNum = sitemap.DeviceValsualFuzhuV[i].a_mark_num
-             this.fuzhuV.push( sitemap.DeviceValsualFuzhuV[i])
-           }
+            if(sitemap.DeviceValsualFuzhuV!=null && sitemap.DeviceValsualFuzhuV.length>0){
+              for(let i=0;i<sitemap.DeviceValsualFuzhuV.length;i++){
+              sitemap.DeviceValsualFuzhuV[i].v_markNum = sitemap.DeviceValsualFuzhuV[i].a_mark_num
+              this.fuzhuV.push( sitemap.DeviceValsualFuzhuV[i])
+             }
+            }
+         
          
              this.fangxiangA = []
-             for(let i=0;i<sitemap.DeviceValsualMapFangxiangA.length;i++){
-               sitemap.DeviceValsualMapFangxiangA[i].markNum = sitemap.DeviceValsualMapFangxiangA[i].mark_n
-               this.fangxiangA.push(sitemap.DeviceValsualMapFangxiangA[i])
+             if(sitemap.DeviceValsualMapFangxiangA!=null && sitemap.DeviceValsualMapFangxiangA.length>0){
+               for(let i=0;i<sitemap.DeviceValsualMapFangxiangA.length;i++){
+                sitemap.DeviceValsualMapFangxiangA[i].markNum = sitemap.DeviceValsualMapFangxiangA[i].mark_n
+                this.fangxiangA.push(sitemap.DeviceValsualMapFangxiangA[i])
+               }
              }
+           
              
              
              this.fangxiangV = []
-             for(let i=0;i<sitemap.DeviceValsualMapFangxiangV.length;i++){
-               sitemap.DeviceValsualMapFangxiangV[i].markNum = sitemap.DeviceValsualMapFangxiangV[i].mark_num
-               this.fangxiangV.push(sitemap.DeviceValsualMapFangxiangV[i])
-             }
+             if(sitemap.DeviceValsualMapFangxiangV!=null && sitemap.DeviceValsualMapFangxiangV.length>0){
+                for(let i=0;i<sitemap.DeviceValsualMapFangxiangV.length;i++){
+                sitemap.DeviceValsualMapFangxiangV[i].markNum = sitemap.DeviceValsualMapFangxiangV[i].mark_num
+                this.fangxiangV.push(sitemap.DeviceValsualMapFangxiangV[i])
+              }
+             } 
+            
              
              this.text_arr = []
-             for(let i=0;i<sitemap.DeviceValsualTextArr.length;i++){
+             if(sitemap.DeviceValsualTextArr!=null && sitemap.DeviceValsualTextArr.length>0){
+              for(let i=0;i<sitemap.DeviceValsualTextArr.length;i++){
                this.text_arr.push(sitemap.DeviceValsualTextArr[i])
+              }
              }
+            
 
              this.Aarr = []
-             for(let i=0;i<sitemap.DeviceValusalMapArr.length;i++){
-               sitemap.DeviceValusalMapArr[i].markNum = sitemap.DeviceValusalMapArr[i].mark_num
-               sitemap.DeviceValusalMapArr[i].is_status = sitemap.DeviceValusalMapArr[i].is_status
-               this.Aarr.push(sitemap.DeviceValusalMapArr[i])
+             if(sitemap.DeviceValusalMapArr!=null && sitemap.DeviceValusalMapArr.length>0){
+              for(let i=0;i<sitemap.DeviceValusalMapArr.length;i++){
+                sitemap.DeviceValusalMapArr[i].markNum = sitemap.DeviceValusalMapArr[i].mark_num
+                sitemap.DeviceValusalMapArr[i].is_status = sitemap.DeviceValusalMapArr[i].is_status
+                this.Aarr.push(sitemap.DeviceValusalMapArr[i])
+              }
              }
+             
 
              this.Varr = []
-             for(let i=0;i<sitemap.DeviceValusalMapVrr.length;i++){
+             if(sitemap.DeviceValusalMapVrr!=null && sitemap.DeviceValusalMapVrr.length>0){
+              for(let i=0;i<sitemap.DeviceValusalMapVrr.length;i++){
                sitemap.DeviceValusalMapVrr[i].markNum = sitemap.DeviceValusalMapVrr[i].mark_num
                sitemap.DeviceValusalMapVrr[i].is_status = sitemap.DeviceValusalMapVrr[i].is_status
                this.Varr.push(sitemap.DeviceValusalMapVrr[i])
              }
+             }
+          
              
             }