陈少旭 1 vuosi sitten
vanhempi
commit
b22c6b6e5f

+ 13 - 0
src/api/his/his_export.js Näytä tiedosto

@@ -24,3 +24,16 @@ export function handleData10138Two(params) {
24 24
   });
25 25
 }
26 26
 
27
+
28
+export function exportData9919(params) {
29
+  return request({
30
+    url: "/api/export",
31
+    method: "get",
32
+    params:params,
33
+  });
34
+}
35
+
36
+
37
+
38
+
39
+

+ 25 - 0
src/api/qcd.js Näytä tiedosto

@@ -149,3 +149,28 @@ export function GetFiveInstatistisc(params) {
149 149
 
150 150
 
151 151
 
152
+
153
+export function GetAllCommonQCStatistisData(params) {
154
+  return request({
155
+    url: '/api/commonqc/statistiscall/get',
156
+    method: 'get',
157
+    params: params
158
+  })
159
+}
160
+
161
+export function GetCommonPersonQCStatistisData(params) {
162
+  return request({
163
+    url: '/api/commonqc/statistiscperson/get',
164
+    method: 'get',
165
+    params: params
166
+  })
167
+}
168
+
169
+
170
+export function GetCommonQCPatientStatistiscPersonData(params) {
171
+  return request({
172
+    url: '/api/commonqc/patientstatistiscall/get',
173
+    method: 'get',
174
+    params: params
175
+  })
176
+}

+ 10 - 1
src/api/statistics.js Näytä tiedosto

@@ -5,4 +5,13 @@ export function fetchStatistics(){
5 5
         url:'/api/statistisc/index',
6 6
         method:'get',
7 7
       })
8
-}
8
+}
9
+
10
+
11
+export function getStatisticsList(){
12
+  return request({
13
+    url:'/api/qc/statistiscperson/list',
14
+    method:'get',
15
+  })
16
+}
17
+

+ 2 - 1
src/lang/zh.js Näytä tiedosto

@@ -301,7 +301,8 @@ export default {
301 301
     objectRegistration:"医疗器械登记",
302 302
     Dialysisanalysis: '专业质控',
303 303
     queryData:"结算数据查询",
304
-    chargeDetailManagementTwo:"门诊明细上传"
304
+    chargeDetailManagementTwo:"门诊明细上传",
305
+    orgExportData:"数据导出",
305 306
   },
306 307
   navbar: {
307 308
     logOut: '退出登录',

+ 19 - 1
src/router/modules/Dialysisanalysis.js Näytä tiedosto

@@ -11,7 +11,25 @@ export default {
11 11
     icon: 'statistics'
12 12
   },
13 13
   children: [
14
-
14
+    {
15
+      path: '/Dialysisanalysis/qualitycontrol/otherIndicators',
16
+      component: () => import('@/xt_pages/Dialysisanalysis/otherIndicators/index'),
17
+      name: 'otherIndicators',
18
+      meta: {
19
+        title: '其他指标',
20
+        noCache: true
21
+      }
22
+    }, {
23
+      path: '/Dialysisanalysis/qualitycontrol/Indicatorsdetail',
24
+      component: () => import('@/xt_pages/Dialysisanalysis/otherIndicators/otherIndicators'),
25
+      name: 'otherIndicators_two',
26
+      hidden: true,
27
+      is_menu: false,
28
+      meta: {
29
+        title: '',
30
+        noCache: true
31
+      }
32
+    },
15 33
     {
16 34
       path: '/Dialysisanalysis/qualitycontrol/thyroidGland',
17 35
       component: () => import('@/xt_pages/Dialysisanalysis/qualitycontrol/thyroidGland'),

+ 5 - 0
src/router/modules/hisTool.js Näytä tiedosto

@@ -157,6 +157,11 @@ export default {
157 157
       component: () => import('@/xt_pages/outpatientTool/exportOne'),
158 158
       name: 'exportOne',
159 159
       meta: { title: 'exportOne', noCache: true }
160
+    }, {
161
+      path: '/hisTool/orgExportData',
162
+      component: () => import('@/xt_pages/outpatientTool/org_export_data'),
163
+      name: 'orgExportData',
164
+      meta: { title: 'orgExportData', noCache: true }
160 165
     }
161 166
   ]
162 167
 }

+ 42 - 25
src/xt_pages/Dialysisanalysis/otherIndicators/index.vue Näytä tiedosto

@@ -2,51 +2,68 @@
2 2
 <template>
3 3
     <div class="main-contain">
4 4
       <div class="position">
5
-        <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+<!--        <bread-crumb :crumbs="crumbs"></bread-crumb>-->
6 6
       </div>
7 7
       <div class="app-container">
8 8
         <div class="page_patientControlAnalysis">
9
-            <el-tabs v-model="activeName" @tab-click="handleClick" >
10
-                <el-tab-pane label="统计全部" name="first">
11
-                  <keep-alive>
12
-                    <otherall v-if="activeName == 'first'"></otherall>
13
-                  </keep-alive>
14
-                </el-tab-pane>
15
-                
16
-                <el-tab-pane label="统计个人" name="second">
17
-                  <keep-alive>
18
-                    <otheralone v-if="activeName == 'second'"></otheralone>
19
-                  </keep-alive>
20
-                </el-tab-pane>
21
-            
22
-            </el-tabs>
9
+          <div v-for="item in indicators">
10
+            <el-button @click="jump(item.inspection_major,item.inspection_minor,item.id)">{{item.item_name}}</el-button>
11
+          </div>
23 12
         </div>
24 13
       </div>
25 14
     </div>
26
-  </template>
27
-  
15
+</template>
16
+
28 17
 <script>
29
-// import echarts from 'echarts'
30 18
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
31
-import otherall from './otherall.vue'
32
-import otheralone from './otheralone.vue'
19
+import { getStatisticsList } from '../../../api/statistics'
33 20
 export default {
34
-    name:'thyroidGland',
21
+    name:'index',
35 22
     components: {
36 23
         BreadCrumb,
37
-        otherall,
38
-        otheralone
39 24
     },
40 25
     data() {
41 26
         return {
27
+          indicators:[{
28
+            name:"钾离子",
29
+            project_id:0,
30
+            item_id:0,
31
+          },{
32
+            name:"钠离子",
33
+            project_id:0,
34
+            item_id:0,
35
+          },{
36
+            name:"无机磷",
37
+            project_id:0,
38
+            item_id:0,
39
+          }],
42 40
             activeName: 'first'
43 41
         }
44 42
     },
45 43
     methods:{
44
+     getStatisticsList(){
45
+        let params = {
46
+        }
47
+        this.indicators = []
48
+        getStatisticsList(params).then(response => {
49
+          if (response.data.state == 1) {
50
+            this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
51
+          } else {
52
+            this.$message.error(response.data.msg)
53
+          }
54
+        })
55
+      },
56
+      jump(project_id, item_id,project_type){
57
+        this.$router.push('/Dialysisanalysis/qualitycontrol/Indicatorsdetail?project_id='+project_id+"&item_id="+item_id+"&project_type="+parseInt(project_type))
58
+      },
46 59
       handleClick(tab, event) {
47 60
         console.log(tab, event);
48 61
       }
49
-    }
62
+    },
63
+    created(){
64
+    this.getStatisticsList()
65
+
66
+  }
50 67
 }
51 68
 </script>
52 69
 
@@ -99,4 +116,4 @@ export default {
99 116
 // }
100 117
 
101 118
 // }
102
-</style>
119
+</style>

+ 8 - 2
src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicators.vue Näytä tiedosto

@@ -9,13 +9,13 @@
9 9
         <el-tabs v-model="activeName" @tab-click="handleClick" >
10 10
           <el-tab-pane label="统计全部" name="first">
11 11
             <keep-alive>
12
-              <otherIndicatorsall :project_id="project_id" :item_id="item_id" v-if="activeName == 'first'"></otherIndicatorsall>
12
+              <otherIndicatorsall :project_type="project_type" :project_id="project_id" :item_id="item_id" v-if="activeName == 'first'"></otherIndicatorsall>
13 13
             </keep-alive>
14 14
           </el-tab-pane>
15 15
 
16 16
           <el-tab-pane label="统计个人" name="second">
17 17
             <keep-alive>
18
-              <otherIndicatorsone  :project_id="project_id" :item_id="item_id"  v-if="activeName == 'second'"></otherIndicatorsone>
18
+              <otherIndicatorsone  :project_type="project_type" :project_id="project_id" :item_id="item_id"  v-if="activeName == 'second'"></otherIndicatorsone>
19 19
             </keep-alive>
20 20
           </el-tab-pane>
21 21
 
@@ -42,6 +42,8 @@ export default {
42 42
       activeName: 'first',
43 43
       project_id:this.$route.query.project_id,
44 44
       item_id:this.$route.query.item_id,
45
+      project_type:this.$route.query.project_type,
46
+
45 47
 
46 48
     }
47 49
   },
@@ -49,6 +51,10 @@ export default {
49 51
     handleClick(tab, event) {
50 52
       console.log(tab, event);
51 53
     }
54
+  },created() {
55
+    console.log(this.$route.query.project_id)
56
+    console.log(this.$route.query.item_id)
57
+
52 58
   }
53 59
 }
54 60
 </script>

+ 70 - 10
src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsall.vue Näytä tiedosto

@@ -18,7 +18,7 @@
18 18
       <el-col :span="8">
19 19
         <div>
20 20
           <el-date-picker
21
-            style="width: 200px"
21
+            style="width: 150px"
22 22
 
23 23
             v-model="start_time"
24 24
             format="yyyy-MM-dd"
@@ -29,7 +29,7 @@
29 29
           </el-date-picker>
30 30
           <span>-</span>
31 31
           <el-date-picker
32
-            style="width: 200px"
32
+            style="width: 150px"
33 33
             v-model="end_time"
34 34
             format="yyyy-MM-dd"
35 35
             value-format="yyyy-MM-dd"
@@ -38,6 +38,21 @@
38 38
           </el-date-picker>
39 39
         </div>
40 40
       </el-col>
41
+      <el-col :span="5">
42
+        <div class="block">
43
+          <span>项目:</span>
44
+          <el-select size="small"  placeholder="请选择" v-model="project_type_two"
45
+                     style="width:150px;margin-left:10px;" @change="changeProjctItem">
46
+            <el-option
47
+              v-for="item,index in indicators"
48
+              :key="index"
49
+              :label="item.item_name"
50
+              :value="item.id">
51
+            </el-option>
52
+          </el-select>
53
+        </div>
54
+      </el-col>
55
+
41 56
       <el-col :span="5">
42 57
         <div >
43 58
           <el-input disabled v-model="input" placeholder="请输入内容"></el-input>
@@ -229,17 +244,26 @@
229 244
 </template>
230 245
 <script>
231 246
 import * as echarts from 'echarts'
232
-import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
233
-import { number } from 'echarts/lib/export'
247
+import { GetCommonQCPatientStatistiscPersonData, GetAllCommonQCStatistisData } from '../../../api/qcd'
248
+import { getStatisticsList } from '../../../api/statistics'
249
+// import { number } from 'echarts/lib/export'
234 250
 
235 251
 const moment = require('moment')
236 252
 
237 253
 export default {
238 254
   props: {
239 255
     project_id:{
240
-      type: number,
256
+      type: Number,
257
+      default: 0
258
+
241 259
     }, item_id:{
242
-      type: number,
260
+      type: Number,
261
+      default: 0
262
+
263
+    },project_type:{
264
+      type: String,
265
+      default: 0
266
+
243 267
     },
244 268
     width: {
245 269
       type: String,
@@ -253,6 +277,7 @@ export default {
253 277
   },
254 278
   data() {
255 279
     return {
280
+      project_type_two:0,
256 281
       statistics_types:[
257 282
         { value: 1, label: '不达标患者' },
258 283
         { value: 2, label: '未检查患者' },
@@ -279,6 +304,7 @@ export default {
279 304
 
280 305
       ],
281 306
       reference:{},
307
+      config:{},
282 308
       time_month: '',
283 309
       start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
284 310
       end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
@@ -294,12 +320,36 @@ export default {
294 320
       sort_type:"",
295 321
       keyword:"",
296 322
       patientTableData:[],
323
+      indicators:[],
297 324
     }
298 325
   },
299 326
   mounted() {
327
+
300 328
     this.getData()
329
+    this.getStatisticsList()
301 330
   },
302 331
   methods: {
332
+    getStatisticsList(){
333
+      let params = {
334
+      }
335
+      this.indicators = []
336
+      getStatisticsList(params).then(response => {
337
+        if (response.data.state == 1) {
338
+          // this.indicators.push()
339
+          this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
340
+          for(var i = 0; i < this.indicators.length;i++){
341
+            if(this.indicators[i].id == this.project_type){
342
+              this.project_type_two   = this.indicators[i].id
343
+            }
344
+
345
+
346
+          }
347
+        } else {
348
+          this.$message.error(response.data.msg)
349
+        }
350
+      })
351
+    },
352
+
303 353
     exportAction(){
304 354
       let list = []
305 355
       for (let i = 0; i < this.patientTableData.length; i++) {
@@ -428,7 +478,7 @@ export default {
428 478
         keyword: this.keyword,
429 479
       }
430 480
       this.patientTableData = []
431
-      GetAllQCStatistisData(params).then(response => {
481
+      GetCommonQCPatientStatistiscPersonData(params).then(response => {
432 482
         if (response.data.state == 1) {
433 483
           this.detailVisibility = true
434 484
           this.patientTableData  =  this.patientTableData.concat(response.data.data.list)
@@ -453,11 +503,12 @@ export default {
453 503
       }
454 504
       this.pieData = []
455 505
       this.tableData = []
456
-      console.log("~~~~~~~~~~")
457
-      GetQCStatistisData(params).then(response => {
506
+      GetAllCommonQCStatistisData(params).then(response => {
458 507
         if (response.data.state == 1) {
459 508
           this.reference = response.data.data.reference
460
-          this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
509
+          this.config = response.data.data.config
510
+
511
+          this.input = this.config.min_range + "<=" + response.data.data.reference.item_name + "<=" +this.config.large_range
461 512
           let objone = {
462 513
             value:  response.data.data.unusual_total ,
463 514
             name: '不达标值患者',
@@ -557,6 +608,15 @@ export default {
557 608
         }
558 609
       })
559 610
 
611
+    },changeProjctItem(val){
612
+      console.log(val)
613
+      for(let i = 0;i < this.indicators.length;i++){
614
+        if(this.indicators[i].id == val){
615
+          this.project_id = this.indicators[i].inspection_major
616
+          this.item_id = this.indicators[i].inspection_minor
617
+          this.input = this.indicators[i].min_range + "<=" + this.indicators[i].item_name + "<=" +this.indicators[i].large_range
618
+        }
619
+      }
560 620
     },
561 621
     changeItem(val) {
562 622
       const currentDate = new Date()

+ 76 - 10
src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsone.vue Näytä tiedosto

@@ -54,6 +54,21 @@
54 54
             value-format="yyyy-MM-dd"
55 55
           ></el-date-picker>
56 56
 
57
+          <el-col :span="5">
58
+            <div class="block">
59
+              <span>项目:</span>
60
+              <el-select size="small"  placeholder="请选择" v-model="project_type_two"
61
+                         style="width:150px;margin-left:10px;" @change="changeProjctItem">
62
+                <el-option
63
+                  v-for="item,index in indicators"
64
+                  :key="index"
65
+                  :label="item.item_name"
66
+                  :value="item.id">
67
+                </el-option>
68
+              </el-select>
69
+            </div>
70
+          </el-col>
71
+
57 72
           <el-button size="small" icon="el-icon-printer" @click="printAction" type="primary">打印
58 73
           </el-button>
59 74
           <el-button size="small" icon="el-icon-printer" @click="exportAction" type="primary">导出
@@ -104,7 +119,7 @@
104 119
                   </template>
105 120
                 </el-table-column>
106 121
 
107
-                <el-table-column width="100" label="血红蛋白" align="center">
122
+                <el-table-column width="100" :label="item_name" align="center">
108 123
                   <template slot-scope="scope">
109 124
                     {{scope.row.value}}
110 125
                   </template>
@@ -130,15 +145,35 @@ import {
130 145
 } from '@/api/common/statistics'
131 146
 import { PostSearch } from '@/api/patient'
132 147
 import { getDataConfig } from '@/utils/data'
133
-import { GetPersonQCStatistisData } from '../../../api/qcd'
148
+import { GetCommonPersonQCStatistisData } from '../../../api/qcd'
134 149
 import LineChart from '../../qcd/components/LineChart.vue'
150
+import { getStatisticsList } from '../../../api/statistics'
135 151
 
136 152
 export default {
137 153
   components: {
138 154
     LineChart
139 155
   },
156
+  props: {
157
+    project_id:{
158
+      type: Number,
159
+      default: 0
160
+
161
+    }, item_id:{
162
+      type: Number,
163
+      default: 0
164
+
165
+    },project_type:{
166
+      type: Number,
167
+      default: 0
168
+
169
+    }
170
+
171
+  },
172
+
140 173
   data() {
141 174
     return {
175
+      indicators:[],
176
+      project_type_two:0,
142 177
       pickerOptions: {
143 178
         disabledDate(time) {
144 179
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
@@ -152,6 +187,7 @@ export default {
152 187
       tableData: [],
153 188
       loading: false,
154 189
       search_value: '',
190
+      item_name:"",
155 191
       total: 0,
156 192
       query: {
157 193
         patient_id: '',
@@ -349,6 +385,39 @@ export default {
349 385
     }
350 386
   },
351 387
   methods: {
388
+    changeProjctItem(val){
389
+      console.log(val)
390
+      for(let i = 0;i < this.indicators.length;i++){
391
+        if(this.indicators[i].id == val){
392
+          this.project_id = this.indicators[i].inspection_major
393
+          this.item_id = this.indicators[i].inspection_minor
394
+          this.query.project_id = this.indicators[i].inspection_major
395
+          this.query.item_id = this.indicators[i].inspection_minor
396
+          this.item_name = this.indicators[i].item_name
397
+          this.GetPersonQCStatistisData(this.query)
398
+          this.GetInspectionCheckIndexTableData(this.query)
399
+        }
400
+      }
401
+    },
402
+    getStatisticsList(){
403
+      let params = {
404
+      }
405
+      this.indicators = []
406
+      getStatisticsList(params).then(response => {
407
+        if (response.data.state == 1) {
408
+          this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
409
+          for(var i = 0; i < this.indicators.length;i++){
410
+            if(this.indicators[i].id == this.project_type){
411
+              this.project_type_two   = this.indicators[i].id
412
+            }
413
+          }
414
+
415
+        } else {
416
+          this.$message.error(response.data.msg)
417
+        }
418
+      })
419
+    },
420
+
352 421
     printAction(){
353 422
       this.$router.push({
354 423
         path: "/Dialysisanalysis/qualitycontrol/print?patient_id=" + this.query.patient_id+"&project_id="+this.query.project_id+"&item_id="+this.query.item_id+"&start_time="+this.query.start_time+"&end_time="+this.query.end_time
@@ -473,7 +542,7 @@ export default {
473 542
     },
474 543
     GetInspectionCheckIndexTableData(params) {
475 544
       this.loading = true
476
-      GetPersonQCStatistisData(params)
545
+      GetCommonPersonQCStatistisData(params)
477 546
         .then(rs => {
478 547
           var resp = rs.data
479 548
           console.log("resp=====",resp)
@@ -504,7 +573,7 @@ export default {
504 573
       this.bar.xAxis.data = []
505 574
       this.bar.series[0].data = []
506 575
       this.percent = []
507
-      GetPersonQCStatistisData(params)
576
+      GetCommonPersonQCStatistisData(params)
508 577
         .then(rs => {
509 578
           var resp = rs.data
510 579
           if (resp.state == 1) {
@@ -607,13 +676,10 @@ export default {
607 676
     this.query.patient_id = 0
608 677
     this.query.end_time = year + '-' + month + '-' + day
609 678
     this.query.start_time = year + '-' + last_month + '-' + day
610
-    this.query.project_id = 1
611
-    this.query.item_id = 17
679
+    this.query.project_id = this.project_id
680
+    this.query.item_id = this.item_id
612 681
     this.getCurrentOrgPatients()
613
-
614
-    // this.GetPersonQCStatistisData()
615
-
616
-
682
+    this.getStatisticsList()
617 683
   }
618 684
 }
619 685
 </script>

+ 60 - 2
src/xt_pages/outpatientCharges/components/registerDialog.vue Näytä tiedosto

@@ -156,6 +156,18 @@
156 156
           </el-option>
157 157
         </el-select>
158 158
       </el-form-item>
159
+
160
+
161
+      <el-form-item label="余额:" :validate-event="is_Name">
162
+       <label>{{form.blac}}</label>
163
+      </el-form-item>
164
+
165
+      <el-form-item label="身份类型:" :validate-event="is_Name" v-if="$store.getters.xt_user.org_id == 10375">
166
+        <el-button style="margin-left:10px;" type="primary" @click="checkID">查看身份类型</el-button>
167
+      </el-form-item>
168
+
169
+
170
+
159 171
       <el-form-item label="挂号费:">
160 172
         <el-input v-model="form.registration_fee"></el-input>
161 173
       </el-form-item>
@@ -265,7 +277,9 @@
265 277
           medical_expenses: '',
266 278
           cost: '',
267 279
           phone: '',
268
-          social_type: ''
280
+          social_type: '',
281
+          blac:'',
282
+          psn_desc:"",
269 283
         },
270 284
         IDCardTypes: [{
271 285
           value: 1,
@@ -424,6 +438,40 @@
424 438
       diagnoses: Array
425 439
     },
426 440
     methods: {
441
+      checkID(){
442
+        this.$alert(this.psn_desc, '身份类型', {
443
+          confirmButtonText: '确定',
444
+          callback: action => {
445
+          }
446
+        });
447
+      },
448
+      getPsnName(type){
449
+        switch (type){
450
+          case "":
451
+
452
+            break
453
+          case "":
454
+
455
+            break
456
+          case "":
457
+
458
+            break
459
+          case "":
460
+
461
+            break
462
+          case "":
463
+
464
+            break
465
+          case "":
466
+
467
+            break
468
+
469
+
470
+
471
+        }
472
+
473
+
474
+      },
427 475
       check11(){
428 476
 
429 477
         if(this.form.social_type == 0 || this.form.social_type == ''){
@@ -709,6 +757,8 @@
709 757
                         that.form.medical_insurance_card = response.data.data.number
710 758
                         that.form.social_type = parseInt(response.data.data.insutype)
711 759
 
760
+
761
+
712 762
                       } else if (that.form.id_card_type == 2) {
713 763
                         that.form.id = patient.id
714 764
                         that.form.name = patient.name
@@ -717,6 +767,7 @@
717 767
                         that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
718 768
                         that.form.phone = patient.phone
719 769
                         that.form.id_card = patient.id_card_no
770
+
720 771
                       } else {
721 772
                         that.form.id = patient.id
722 773
                         that.form.name = patient.name
@@ -726,6 +777,7 @@
726 777
                         that.form.phone = patient.phone
727 778
                         that.form.id_card = patient.id_card_no
728 779
                         that.form.social_type = parseInt(response.data.data.insutype)
780
+
729 781
                       }
730 782
                       that.$message({ message: '读卡成功', type: 'success' })
731 783
                     }
@@ -780,8 +832,11 @@
780 832
                     that.form.id_card = patient.id_card_no
781 833
                     that.form.medical_insurance_card = response.data.data.number
782 834
                     that.form.social_type = parseInt(response.data.data.insutype)
835
+                    that.form.blac = response.data.data.blac
836
+                    that.form.psn_desc = response.data.data.desc
783 837
 
784 838
                   } else if (that.form.id_card_type == 2) {
839
+                    2
785 840
                     that.form.id = patient.id
786 841
                     that.form.name = patient.name
787 842
                     that.form.gender = patient.gender
@@ -789,6 +844,8 @@
789 844
                     that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
790 845
                     that.form.phone = patient.phone
791 846
                     that.form.id_card = patient.id_card_no
847
+                    that.form.blac = response.data.data.blac
848
+                    that.form.psn_desc = response.data.data.desc
792 849
                   } else {
793 850
                     that.form.id = patient.id
794 851
                     that.form.name = patient.name
@@ -798,7 +855,8 @@
798 855
                     that.form.phone = patient.phone
799 856
                     that.form.id_card = patient.id_card_no
800 857
                     that.form.social_type = parseInt(response.data.data.insutype)
801
-
858
+                    that.form.blac = response.data.data.blac
859
+                    that.form.psn_desc = response.data.data.desc
802 860
                   }
803 861
                   that.$message({ message: '读卡成功', type: 'success' })
804 862
                 }

+ 2 - 0
src/xt_pages/outpatientCharges/statementPrint.vue Näytä tiedosto

@@ -148,6 +148,7 @@ export default {
148 148
         { code: '410100', name: '工伤保险基金' },
149 149
         { code: '510100', name: '生育基金' },
150 150
         { code: '610100', name: '医疗救助基金' },
151
+         { code: '610101', name: '医疗救助基金' },
151 152
         { code: '610200', name: '优抚对象医疗补助基金' },
152 153
         { code: '620100', name: '特惠保补偿金' },
153 154
         { code: '630100', name: '医院减免金' },
@@ -1514,6 +1515,7 @@ export default {
1514 1515
                   funds.push(objs)
1515 1516
                 }
1516 1517
                 that.info['funds'] = funds
1518
+                console.log(that.info)
1517 1519
               }
1518 1520
             })
1519 1521
             .catch(function(error) {

+ 3 - 3
src/xt_pages/outpatientCharges/statementTemplate/printTen.vue Näytä tiedosto

@@ -92,10 +92,10 @@
92 92
           <tr>
93 93
             <td style="border: 1px solid gray;width: 150px;height: 30px;">结算ID</td>
94 94
             <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.setl_id}}</td>
95
-            <td style="border: 1px solid gray;width: 150px;height: 30px;">住院号</td>
95
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">门诊号</td>
96 96
             <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.number}}</td>
97
-            <td style="border: 1px solid gray;width: 150px;height: 30px;">住院天数</td>
98
-            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{getDay(info.begndate,info.enddate)}}</td>
97
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">门诊天数</td>
98
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{getDay(getTime(info.new_order.settle_start_time,'{y}-{m}-{d}'),getTime(info.new_order.settle_end_time,'{y}-{m}-{d}'))}}</td>
99 99
           </tr>
100 100
           <tr>
101 101
             <td style="border: 1px solid gray;width: 150px;height: 30px;">科室</td>

+ 1 - 1
src/xt_pages/outpatientCharges/statementTemplate/printtwelve.vue Näytä tiedosto

@@ -4,7 +4,7 @@
4 4
       阜阳市医疗保险费用结算单
5 5
     </div>
6 6
     <div style="display: flex;">
7
-      <div style="flex: 1;">结算ID:{{info.new_order.setl_id}}</div>
7
+      <div style="flex: 1;">结算ID:{{info.new_order!=null&&info.new_order.setl_id}}</div>
8 8
       <div style="flex: 1;">结算日期: <span v-if="info.new_order!=null"> {{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</span> </div>
9 9
       <div style="flex: 1;" v-if="info.new_order!=null&&info.new_order.med_type == 14 || info.new_order.med_type == 140104">医疗类别:门诊慢病</div>
10 10
       <div style="flex: 1;" v-if="info.new_order!=null&&info.new_order.med_type == 11">医疗类别:普通门诊</div>

File diff suppressed because it is too large
+ 3811 - 3156
src/xt_pages/outpatientTool/org_export_data.vue