Browse Source

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

csx 3 years ago
parent
commit
74d41aa7b5

+ 10 - 0
src/api/his/his.js View File

@@ -588,3 +588,13 @@ export function postFaPiaoIsUse(params) {
588 588
 
589 589
 
590 590
 
591
+export function deleteNCDSRecord(params) {
592
+  return request({
593
+    url: '/api/psn/ncds/delete',
594
+    method: 'post',
595
+    params: params
596
+  })
597
+}
598
+
599
+
600
+

+ 2 - 2
src/xt_pages/hospitalStation/components/deskPrescription.vue View File

@@ -1867,8 +1867,8 @@ export default {
1867 1867
       this.sick = sick
1868 1868
       this.diagnoses = diagnoses
1869 1869
       this.department = department
1870
-      this.curMonthPrescriptions = {}
1871
-      this.curPrescriptions = {}
1870
+      // this.curMonthPrescriptions = {}
1871
+      // this.curPrescriptions = {}
1872 1872
       // this.$refs.tabProjectTeam.clearSelection()
1873 1873
 
1874 1874
       for (let i = 0; i < doctors.length; i++) {

+ 1 - 4
src/xt_pages/hospitalStation/doctorDesk.vue View File

@@ -405,6 +405,7 @@
405 405
         this.saveLoading = data
406 406
       },
407 407
       changeTimeTwo() {
408
+        this.titleType = "电子处方"
408 409
         this.getList()
409 410
       },
410 411
       openPrint() {
@@ -1416,7 +1417,6 @@
1416 1417
 
1417 1418
               }
1418 1419
             }
1419
-            console.log('~~~~~00000222222')
1420 1420
             this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
1421 1421
           }
1422 1422
         })
@@ -3935,10 +3935,7 @@
3935 3935
         if (this.titleType == '电子处方') {
3936 3936
           if (this.radio == 1) {
3937 3937
             this.un_cure_data.map(item => {
3938
-              console.log('~~~~~~~~')
3939 3938
               if (item.id == this.patientid) {
3940
-                console.log('~~~~~~~~22222222')
3941
-
3942 3939
                 this.getPatientInfo(item)
3943 3940
               }
3944 3941
             })

+ 69 - 3
src/xt_pages/outpatientRecord/outpatientRecord.vue View File

@@ -117,6 +117,15 @@
117 117
                         <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
118 118
                             <span @click="putOnRecord(2,scope.row)">撤消</span>
119 119
                         </el-button>
120
+
121
+
122
+                      <el-button type="primary" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
123
+                        <span @click="putOnRecord(3,scope.row)">查看备案信息</span>
124
+                      </el-button>
125
+
126
+                      <el-button type="primary" size="small" icon="el-icon-tickets" >
127
+                        <span @click="putOnRecord(4,scope.row)">删除</span>
128
+                      </el-button>
120 129
                     </template>
121 130
                 </el-table-column>
122 131
             </el-table>
@@ -201,7 +210,7 @@
201 210
 
202 211
 <script>
203 212
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
204
-  import { getAllDoctorList, getInitData, getRecordList } from '@/api/his/his'
213
+  import { getAllDoctorList, getInitData, getRecordList,deleteNCDSRecord } from '@/api/his/his'
205 214
   import { uParseTime } from '@/utils/tools'
206 215
   import { fetchAllAdminUsers } from '@/api/doctor'
207 216
   import axios from 'axios'
@@ -382,7 +391,7 @@
382 391
 
383 392
           this.getGdybPatientInfo()
384 393
 
385
-        } else {
394
+        } else if(type == 2) {
386 395
           this.$confirm('是否撤销备案', '撤销备案', {
387 396
             confirmButtonText: '确 定',
388 397
             cancelButtonText: '取 消',
@@ -426,8 +435,65 @@
426 435
 
427 436
           })
428 437
 
429
-        }
438
+        }else if(type == 3){
439
+          let params = {
440
+            'id': row.record.id,
441
+            'admin_user_id': this.$store.getters.xt_user.user.id
442
+          };
443
+          var that = this;
444
+          axios.get('http://127.0.0.1:9532/api/psn/info', {
445
+            params: params
446
+          })
447
+              .then(function(response) {
448
+                if (response.data.state == 0) {
449
+                  that.$message.error(response.data.msg);
450
+                  return false
451
+                } else {
452
+                  if(response.data.data.failed_code == -10){
453
+                    // that.$message.error(response.data.data.msg)
454
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
455
+                      confirmButtonText: '确 定',
456
+                      type: 'warning'
457
+                    }).then(() => {
458
+
459
+                    }).catch(() => {
460
+                    })
461
+                  }else{
462
+                    that.$confirm(response.data.data.result, '医保信息', {
463
+                      confirmButtonText: '确 定',
464
+                      type: 'warning'
465
+                    }).then(() => {
466
+
467
+                    }).catch(() => {
468
+
469
+                    })
470
+                  }
471
+                }
472
+              })
473
+              .catch(function(error) {
474
+              })
475
+        }else if(type == 4){
476
+          this.$confirm("是否删除", '删除', {
477
+            confirmButtonText: '确 定',
478
+            type: 'warning'
479
+          }).then(() => {
480
+            let params = {
481
+              id: row.record.id,
482
+            }
483
+            deleteNCDSRecord(params).then(response => {
484
+              if (response.data.state == 0) {
485
+                this.$message.error(response.data.msg);
486
+                return false
487
+              } else {
488
+                this.getList()
489
+              }
490
+            })
430 491
 
492
+          }).catch(() => {
493
+          })
494
+
495
+
496
+        }
431 497
       },
432 498
       changeDoctor(row, id) {
433 499
         for (let i = 0; i < this.doctorList.length; i++) {

+ 45 - 2
src/xt_pages/qcd/officesControlAnalysis/time.vue View File

@@ -82,6 +82,39 @@
82 82
           </ul>
83 83
         </div>
84 84
       </div>
85
+
86
+      <div class="cell clearfix">
87
+        <label class="title"> <span class="name">转归状态</span> : </label>
88
+        <div class="time">
89
+          <ul class>
90
+            <li
91
+                :class="item.lapseto == lapsetoType ? 'active' : ''"
92
+                @click="selectLapseTo(item.lapseto)"
93
+                v-for="item in lapsetoState"
94
+                :key="item.value"
95
+            >
96
+              {{ item.label }}
97
+            </li>
98
+          </ul>
99
+        </div>
100
+      </div>
101
+      <div class="cell clearfix">
102
+        <label class="title"> <span class="name">患者来源</span> : </label>
103
+        <div class="time">
104
+          <ul class>
105
+            <li
106
+                :class="item.source == originType ? 'active' : ''"
107
+                @click="selectLapseTo(item.source)"
108
+                v-for="item in originState"
109
+                :key="item.value"
110
+            >
111
+              {{ item.label }}
112
+            </li>
113
+          </ul>
114
+        </div>
115
+      </div>
116
+
117
+
85 118
       <div class="cell clearfix">
86 119
         <p class="chartTitle">统计图</p>
87 120
       </div>
@@ -141,7 +174,17 @@ export default {
141 174
       modesData: {
142 175
         xAxis: [],
143 176
         series: []
144
-      },
177
+      }, lapsetoType: 0,
178
+      lapsetoState: [
179
+        { value: 0, label: '全部', source: 0, lapseto: 0 },
180
+        { value: 1, label: '转出', source: 0, lapseto: 2 },
181
+        { value: 2, label: '留治', source: 0, lapseto: 1 }
182
+      ],originType:0,
183
+      originState: [
184
+        { value: 0, label: '全部', source: 0},
185
+        { value: 1, label: '住院', source: 1},
186
+        { value: 2, label: '门诊', source: 2}
187
+      ],
145 188
       crumbs: [
146 189
         { path: false, name: '质控管理' },
147 190
         { path: false, name: '科室质控达标统计' },
@@ -742,7 +785,7 @@ export default {
742 785
           this.chart.series[0].data = this.modesData.series
743 786
           this.chart.xAxis.data = this.modesData.xAxis
744 787
           this.getArrLength(this.chart.xAxis.data)
745
-        }else{
788
+        } else {
746 789
           this.isLoading = false
747 790
         }
748 791
       })