Explorar el Código

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

XMLWAN hace 4 años
padre
commit
a392b2aeb7

+ 0 - 2
src/main.js Ver fichero

@@ -58,5 +58,3 @@ new Vue({
58 58
 Vue.prototype.Base64 = require('js-base64').Base64
59 59
 
60 60
 
61
-
62
-

+ 1 - 1
src/xt_pages/outpatientCharges/newStatementPrint.vue Ver fichero

@@ -152,7 +152,7 @@
152 152
 
153 153
       },
154 154
       getInfo(order_id) {
155
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9671 ) {
155
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
156 156
 
157 157
           var that = this
158 158
 

+ 8 - 9
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Ver fichero

@@ -136,7 +136,7 @@
136 136
                         </el-button>
137 137
 
138 138
                         <el-button
139
-                                v-if="this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 "
139
+                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671"
140 140
                                 size="small" @click="open(10)" type="primary"
141 141
                         >退号
142 142
                         </el-button>
@@ -527,7 +527,7 @@
527 527
     },
528 528
     methods: {
529 529
       query() {
530
-        if (this.$store.getters.xt_user.org_id == 9919) {
530
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
531 531
           var that = this
532 532
           axios.get('http://127.0.0.1:9532/api/org/info', {
533 533
             params: {}
@@ -645,8 +645,7 @@
645 645
 
646 646
             })
647 647
 
648
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9671 ) {
649
-
648
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
650 649
           var that = this
651 650
           axios.get('http://127.0.0.1:9532/api/upload/get', {
652 651
             params: form,
@@ -796,7 +795,7 @@
796 795
         var that = this
797 796
 
798 797
         if ( this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 9504 ) {
799
-         
798
+
800 799
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
801 800
             params: forms,
802 801
             headers: {
@@ -868,7 +867,7 @@
868 867
 
869 868
             })
870 869
 
871
-        } else if (this.$store.getters.xt_user.org_id == 9919  ||  this.$store.getters.xt_user.org_id == 9671   ) {
870
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
872 871
 
873 872
           axios.get('http://127.0.0.1:9532/api/register/get', {
874 873
             params: forms,
@@ -1488,8 +1487,8 @@
1488 1487
           }
1489 1488
 
1490 1489
         } else if (index == 5) {
1491
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9671) {
1492
-            console.log("处方222")
1490
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
1491
+
1493 1492
             var that = this
1494 1493
             this.$confirm('是否退费', '退费', {
1495 1494
               confirmButtonText: '确 定',
@@ -1720,7 +1719,7 @@
1720 1719
             })
1721 1720
         } else if (index == 15) {
1722 1721
           var that = this
1723
-          if (this.$store.getters.xt_user.org_id == 9919) {
1722
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
1724 1723
 
1725 1724
             if (this.diagnosis.length || this.diagnosis == 0) {
1726 1725
               that.$message.error('诊断不能为空,请选择诊断内容')

+ 99 - 6
src/xt_pages/outpatientRecord/outpatientRecord.vue Ver fichero

@@ -13,7 +13,7 @@
13 13
                         搜索
14 14
                     </el-button>
15 15
                 </div>
16
-                <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>
16
+                <!--<el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>-->
17 17
             </div>
18 18
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
19 19
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -28,7 +28,7 @@
28 28
                 >
29 29
                 </el-table-column>
30 30
                 <el-table-column align="center" prop="name" label="流水号">
31
-                    <template slot-scope="scope">{{scope.row.trt_dcla_detl_sn}}</template>
31
+                    <template slot-scope="scope">{{scope.row.record.trt_dcla_detl_sn}}</template>
32 32
                 </el-table-column>
33 33
                 <el-table-column align="center" prop="name" label="时间">
34 34
                     <template slot-scope="scope" v-if="scope.row.ctime > 0">{{getTimes(scope.row.ctime)}}</template>
@@ -38,7 +38,7 @@
38 38
                 </el-table-column>
39 39
                 <el-table-column align="center" prop="name" label="人员编号">
40 40
                     <template slot-scope="scope">
41
-                        <div>{{scope.row.psn_no}}</div>
41
+                        <div>{{scope.row.record.psn_no}}</div>
42 42
                     </template>
43 43
                 </el-table-column>
44 44
                 <el-table-column align="center" prop="name" label="联系电话">
@@ -96,7 +96,7 @@
96 96
 
97 97
                 <el-table-column align="center" prop="name" label="疾病类型">
98 98
                     <template slot-scope="scope">
99
-                        <el-select style="width:100%;" v-model="scope.row.sick_type" placeholder="请选择">
99
+                        <el-select style="width:100%;" v-model="scope.row.record.sick_type" placeholder="请选择">
100 100
                             <el-option
101 101
                                     v-for="(item,index) in sick"
102 102
                                     :key="index"
@@ -120,7 +120,7 @@
120 120
             <el-dialog title="备案" :visible.sync="dialogFormVisible">
121 121
                 <el-form :model="form" label-width="100px">
122 122
                     <el-form-item label="险种类型" :label-width="formLabelWidth">
123
-                        <el-select v-model="insutype" placeholder="请选择" style="width: 200px;">
123
+                        <el-select v-model="insutype_value" placeholder="请选择" style="width: 200px;">
124 124
                             <el-option
125 125
                                     v-for="item in insutypes"
126 126
                                     :key="item.value"
@@ -177,6 +177,8 @@
177 177
         patientLoading: false,
178 178
         sick: [],
179 179
         limit: 10,
180
+        insutype_value:"",
181
+        psn_no:"",
180 182
         page: 1,
181 183
         dialogFormVisible: false,
182 184
         total: 0,
@@ -195,6 +197,32 @@
195 197
             label: '明细'
196 198
           }
197 199
         ],
200
+        insutype_arr: [
201
+          {
202
+            value: '310',
203
+            label: '职工基本医疗保险'
204
+          }, {
205
+            value: '320',
206
+            label: '公务员医疗补助'
207
+          }, {
208
+            value: '330',
209
+            label: '大额医疗费用补助'
210
+          }, {
211
+            value: '340',
212
+            label: '离休人员医疗保障'
213
+          },
214
+          {
215
+            value: '390',
216
+            label: '城乡居民基本医疗保险'
217
+          }, {
218
+            value: '392',
219
+            label: '城乡居民大病医疗保险'
220
+          }, {
221
+            value: '510',
222
+            label: '生育保险'
223
+          }
224
+
225
+        ],
198 226
 
199 227
         insutypes: [
200 228
           {
@@ -226,10 +254,63 @@
226 254
       }
227 255
     },
228 256
     methods: {
257
+      getName(value){
258
+        console.log(value)
259
+        for(let i = 0; i < this.insutype_arr.length; i++){
260
+          console.log(this.insutype_arr[i].value)
261
+          if(this.insutype_arr[i].value == value){
262
+            return this.insutype_arr[i].label
263
+          }
264
+        }
265
+        return "未知"
266
+      },
267
+      getGdybPatientInfo(){
268
+        let params ={
269
+          id_card_no:this.currentObject.id_card_no,
270
+          admin_user_id:  this.$store.getters.xt_user.user.id,
271
+        }
272
+        var that = this
273
+        axios.get('http://127.0.0.1:9532/api/patient/info', {
274
+          params: params
275
+        })
276
+          .then(function(response) {
277
+            if (response.data.state == 0) {
278
+              that.$message.error(response.data.msg)
279
+              return false
280
+            } else {
281
+
282
+              if(response.data.data.failed_code == -10){
283
+                that.$message.error(response.data.data.msg)
284
+              }else{
285
+                that.dialogFormVisible = true
286
+                that.insutypes = []
287
+                that.psn_no =  response.data.data.info.output.baseinfo.psn_no
288
+                for (let i =0; i < response.data.data.info.output.insuinfo.length; i++){
289
+                  let obj = {
290
+                    value:response.data.data.info.output.insuinfo[i].insutype,
291
+                    label:""
292
+                  }
293
+                  for(let b = 0; b < that.insutype_arr.length; b++){
294
+                    if(that.insutype_arr[b].value == response.data.data.info.output.insuinfo[i].insutype){
295
+                      obj.label = that.insutype_arr[b].label
296
+                    }
297
+                  }
298
+                  that.insutypes.push(obj)
299
+
300
+                }
301
+              }
302
+            }
303
+          })
304
+          .catch(function(error) {
305
+
306
+          })
307
+      },
229 308
       putOnRecord(type, row) {
230 309
         if (type == 1) {
231
-          this.dialogFormVisible = true
232 310
           this.currentObject = row
311
+
312
+          this.getGdybPatientInfo()
313
+
233 314
         } else {
234 315
           this.$confirm('是否撤销备案', '撤销备案', {
235 316
             confirmButtonText: '确 定',
@@ -302,6 +383,11 @@
302 383
         let params = {
303 384
           record_type: 0,
304 385
           patient_id: this.currentObject.id,
386
+          insutype: this.insutype_value,
387
+          psn_no: this.psn_no,
388
+          sick_id: this.currentObject.record.sick_type,
389
+          doctor_id: this.currentObject.record.doctor_id,
390
+          department_id:this.currentObject.record.department_id,
305 391
           admin_user_id: this.$store.getters.xt_user.user.id
306 392
         }
307 393
 
@@ -320,6 +406,13 @@
320 406
                 for (let i = 0; i < that.tableData.length; i++) {
321 407
                   if (that.tableData[i].id == that.currentObject.id) {
322 408
                     that.tableData[i].record.is_cancel == 1
409
+                    that.tableData[i].record.trt_dcla_detl_sn = response.data.data.result.trt_dcla_detl_sn
410
+
411
+                    that.tableData[i].record.psn_no = response.data.data.result.psn_no
412
+                    that.tableData[i].record.doctor_id = response.data.data.result.doctor_id
413
+                    that.tableData[i].record.trt_dcla_detl_sn = response.data.data.result.trt_dcla_detl_sn
414
+
415
+
323 416
                   }
324 417
                 }
325 418
               }