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
bb7fecfa31

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

188
         let params={
188
         let params={
189
           patient_id:this.patient_id,
189
           patient_id:this.patient_id,
190
           start_time: this.start_time,
190
           start_time: this.start_time,
191
-          end_time:this.end_time
191
+          end_time:this.end_time,
192
+          p_type:1,
193
+
192
         };
194
         };
193
         this.GetCallHisPrescription(params)
195
         this.GetCallHisPrescription(params)
194
       },changeEndTime(){
196
       },changeEndTime(){
195
         let params={
197
         let params={
196
           patient_id:this.patient_id,
198
           patient_id:this.patient_id,
197
           start_time: this.start_time,
199
           start_time: this.start_time,
198
-          end_time:this.end_time
200
+          end_time:this.end_time,
201
+          p_type:1,
202
+
199
         };
203
         };
200
         this.GetCallHisPrescription(params)
204
         this.GetCallHisPrescription(params)
201
       },
205
       },

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

23
           <el-form-item label="证件号: " prop="name" label-position="right">
23
           <el-form-item label="证件号: " prop="name" label-position="right">
24
             <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
24
             <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
25
           </el-form-item>
25
           </el-form-item>
26
-          <el-form-item label="处方类型: " prop="name" label-position="right">
27
-            <el-select style="width:100%;" v-model="register_type" placeholder="">
28
-              <el-option
29
-                v-for="(item,index) in register"
30
-                :key="index"
31
-                :label="item.label"
32
-                :value="item.value">
33
-              </el-option>
34
-            </el-select>
35
-          </el-form-item>
36
-          <el-form-item label="疾病类型:" prop="name" label-position="right">
37
-
38
-            <el-select style="width:100%;" v-model="state1" placeholder="">
39
-              <el-option
40
-                v-for="(item,index) in sick"
41
-                :key="index"
42
-                :label="item.class_name"
43
-                :value="item.id">
44
-              </el-option>
45
-            </el-select>
26
+          <!--<el-form-item label="处方类型: " prop="name" label-position="right">-->
27
+            <!--<el-select style="width:100%;" v-model="register_type" placeholder="">-->
28
+              <!--<el-option-->
29
+                <!--v-for="(item,index) in register"-->
30
+                <!--:key="index"-->
31
+                <!--:label="item.label"-->
32
+                <!--:value="item.value">-->
33
+              <!--</el-option>-->
34
+            <!--</el-select>-->
35
+          <!--</el-form-item>-->
36
+          <!--<el-form-item label="疾病类型:" prop="name" label-position="right">-->
46
 
37
 
47
-          </el-form-item>
38
+            <!--<el-select style="width:100%;" v-model="state1" placeholder="">-->
39
+              <!--<el-option-->
40
+                <!--v-for="(item,index) in sick"-->
41
+                <!--:key="index"-->
42
+                <!--:label="item.class_name"-->
43
+                <!--:value="item.id">-->
44
+              <!--</el-option>-->
45
+            <!--</el-select>-->
48
 
46
 
49
-          <el-form-item label="诊断:" prop="name" label-position="right">
47
+          <!--</el-form-item>-->
50
 
48
 
51
-            <el-select style="width:100%;" v-model="diagnose" placeholder="">
52
-              <el-option
53
-                v-for="(item,index) in diagnoses"
54
-                :key="index"
55
-                :label="item.class_name"
56
-                :value="item.id">
57
-              </el-option>
58
-            </el-select>
49
+          <!--<el-form-item label="诊断:" prop="name" label-position="right">-->
59
 
50
 
60
-          </el-form-item>
51
+            <!--<el-select style="width:100%;" v-model="diagnose" placeholder="">-->
52
+              <!--<el-option-->
53
+                <!--v-for="(item,index) in diagnoses"-->
54
+                <!--:key="index"-->
55
+                <!--:label="item.class_name"-->
56
+                <!--:value="item.id">-->
57
+              <!--</el-option>-->
58
+            <!--</el-select>-->
61
 
59
 
60
+          <!--</el-form-item>-->
62
 
61
 
62
+<!--
63
           <el-form-item label="过敏病史: " prop="name" label-position="right">
63
           <el-form-item label="过敏病史: " prop="name" label-position="right">
64
             <el-autocomplete
64
             <el-autocomplete
65
               style="width:100%;"
65
               style="width:100%;"
68
               :fetch-suggestions="querySearch2"
68
               :fetch-suggestions="querySearch2"
69
               placeholder="请输入内容"
69
               placeholder="请输入内容"
70
             ></el-autocomplete>
70
             ></el-autocomplete>
71
-          </el-form-item>
71
+          </el-form-item>-->
72
+
72
         </el-form>
73
         </el-form>
73
         <div class="tabsBox">
74
         <div class="tabsBox">
74
 
75
 
425
     getDayOrMonthHisPrescription,
426
     getDayOrMonthHisPrescription,
426
     getInitData,
427
     getInitData,
427
     getNextOrLastHisPrescription,
428
     getNextOrLastHisPrescription,
428
-    getPatientInfo,
429
-    getSchedulePatientList
430
   } from '@/api/his/his'
429
   } from '@/api/his/his'
431
   import { getDictionaryDataConfig } from '@/utils/data'
430
   import { getDictionaryDataConfig } from '@/utils/data'
432
   import prescriptionTable from './prescriptionTable'
431
   import prescriptionTable from './prescriptionTable'
967
         let params = {
966
         let params = {
968
           patient_id: this.patientInfo.id,
967
           patient_id: this.patientInfo.id,
969
           start_time: val,
968
           start_time: val,
970
-          end_time: this.end_time
969
+          end_time: this.end_time,
970
+          p_type:1,
971
         };
971
         };
972
         getDayOrMonthHisPrescription(params).then(response => {
972
         getDayOrMonthHisPrescription(params).then(response => {
973
           if (response.data.state == 1) {
973
           if (response.data.state == 1) {
1070
         let params = {
1070
         let params = {
1071
           patient_id: this.patientInfo.id,
1071
           patient_id: this.patientInfo.id,
1072
           start_time: this.start_time,
1072
           start_time: this.start_time,
1073
-          end_time: val
1073
+          end_time: val,
1074
+          p_type:1
1074
         };
1075
         };
1075
         getDayOrMonthHisPrescription(params).then(response => {
1076
         getDayOrMonthHisPrescription(params).then(response => {
1076
           if (response.data.state == 1) {
1077
           if (response.data.state == 1) {
1326
           let params = {
1327
           let params = {
1327
             patient_id: this.patientInfo.id,
1328
             patient_id: this.patientInfo.id,
1328
             record_time: this.request_record_date,
1329
             record_time: this.request_record_date,
1329
-            type: 2
1330
+            type: 2,
1331
+            p_type:1,
1332
+
1330
           };
1333
           };
1331
 
1334
 
1332
           this.GetNextOrLastHisPrescription(params)
1335
           this.GetNextOrLastHisPrescription(params)
1334
           let params = {
1337
           let params = {
1335
             patient_id: this.patientInfo.id,
1338
             patient_id: this.patientInfo.id,
1336
             record_time: this.request_record_date,
1339
             record_time: this.request_record_date,
1337
-            type: 2
1340
+            type: 2,
1341
+            p_type:1,
1338
           };
1342
           };
1339
           this.GetNextOrLastHisPrescription(params)
1343
           this.GetNextOrLastHisPrescription(params)
1340
 
1344
 
1837
           let params = {
1841
           let params = {
1838
             end_time: this.record_date,
1842
             end_time: this.record_date,
1839
             start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1843
             start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1840
-            patient_id: this.patientInfo.id
1844
+            patient_id: this.patientInfo.id,
1845
+            p_type: 1,
1841
           };
1846
           };
1842
           getCallHisPrescription(params).then(response => {
1847
           getCallHisPrescription(params).then(response => {
1843
             if (response.data.state == 1) {
1848
             if (response.data.state == 1) {
1877
             return
1882
             return
1878
           }
1883
           }
1879
 
1884
 
1880
-          if (this.state1  <= 0) {
1881
-            this.$message.error('疾病类型不能为空');
1882
-            return
1883
-          }
1885
+          // if (this.state1  <= 0) {
1886
+          //   this.$message.error('疾病类型不能为空');
1887
+          //   return
1888
+          // }
1884
 
1889
 
1885
 
1890
 
1886
 
1891
 

+ 31 - 7
src/xt_pages/hospitalStation/doctorDesk.vue View File

5
     </div>
5
     </div>
6
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
6
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
7
       <div class="mainLeft">
7
       <div class="mainLeft">
8
-
8
+        <div class="mainCell" style="justify-content: space-between;">
9
+          <p style="font-size:14px;">未就诊:<span>{{cal_one}}</span>人</p>
10
+          <p style="font-size:14px;">已就诊:<span>{{cal_two}}</span>人</p>
11
+        </div>
12
+        <div class="mainCell">
13
+          <el-radio-group v-model="radio" @change="change">
14
+            <el-radio :label="1">未就诊</el-radio>
15
+            <el-radio :label="2">已就诊</el-radio>
16
+            <el-radio :label="0">全部</el-radio>
17
+          </el-radio-group>
18
+        </div>
9
         <div class="mainCell" style="margin-bottom:10px;">
19
         <div class="mainCell" style="margin-bottom:10px;">
10
           <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction" @keyup.enter.native='searchAction'
20
           <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction" @keyup.enter.native='searchAction'
11
                     v-model="search_input" class="filter-item"/>
21
                     v-model="search_input" class="filter-item"/>
674
           } else {
684
           } else {
675
             this.patientTableData = response.data.data.list;
685
             this.patientTableData = response.data.data.list;
676
             this.patientTableDataTwo = response.data.data.list;
686
             this.patientTableDataTwo = response.data.data.list;
687
+            this.cal_one = response.data.data.total_one;
688
+            this.cal_two = response.data.data.total_two;
677
             this.admin_info = response.data.data.info;
689
             this.admin_info = response.data.data.info;
678
 
690
 
679
             if (this.patientTableData.length > 0) {
691
             if (this.patientTableData.length > 0) {
714
           'record_date': this.record_date,
726
           'record_date': this.record_date,
715
           'patient_id': val.id,
727
           'patient_id': val.id,
716
           'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
728
           'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
717
-          'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
729
+          'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
730
+          'p_type':1,
718
 
731
 
719
         };
732
         };
720
         this.isloading = true;
733
         this.isloading = true;
910
                 'record_date': this.record_date,
923
                 'record_date': this.record_date,
911
                 'patient_id': val.id,
924
                 'patient_id': val.id,
912
                 'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
925
                 'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
913
-                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
926
+                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
927
+                'p_type':1,
928
+
929
+
914
               };
930
               };
915
               getPatientInfo(params).then(response => {
931
               getPatientInfo(params).then(response => {
916
                 if (response.data.state == 0) {
932
                 if (response.data.state == 0) {
1077
                 'record_date': this.record_date,
1093
                 'record_date': this.record_date,
1078
                 'patient_id': val.id,
1094
                 'patient_id': val.id,
1079
                 'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1095
                 'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1080
-                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
1096
+                'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
1097
+                'p_type':1,
1098
+
1081
               };
1099
               };
1082
               getPatientInfo(params).then(response => {
1100
               getPatientInfo(params).then(response => {
1083
                 if (response.data.state == 0) {
1101
                 if (response.data.state == 0) {
1245
               'record_date': this.record_date,
1263
               'record_date': this.record_date,
1246
               'patient_id': val.id,
1264
               'patient_id': val.id,
1247
               'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1265
               'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1248
-              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
1266
+              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
1267
+              'p_type':1,
1268
+
1249
             };
1269
             };
1250
             getPatientInfo(params).then(response => {
1270
             getPatientInfo(params).then(response => {
1251
                 if (response.data.state == 0) {
1271
                 if (response.data.state == 0) {
1467
               'record_date': this.record_date,
1487
               'record_date': this.record_date,
1468
               'patient_id': val.id,
1488
               'patient_id': val.id,
1469
               'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1489
               'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1470
-              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
1490
+              'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
1491
+              'p_type':1,
1492
+
1471
             };
1493
             };
1472
             getPatientInfo(params).then(response => {
1494
             getPatientInfo(params).then(response => {
1473
               if (response.data.state == 0) {
1495
               if (response.data.state == 0) {
1638
             'record_date': this.record_date,
1660
             'record_date': this.record_date,
1639
             'patient_id': val.id,
1661
             'patient_id': val.id,
1640
             'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1662
             'start_time': moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1641
-            'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD")
1663
+            'end_time': moment(new Date()).add('year', 0).format("YYYY-MM-DD"),
1664
+            'p_type':1,
1665
+
1642
           };
1666
           };
1643
           getPatientInfo(params).then(response => {
1667
           getPatientInfo(params).then(response => {
1644
             if (response.data.state == 0) {
1668
             if (response.data.state == 0) {

+ 8 - 6
src/xt_pages/hospitalStation/outpatientChargesManagement.vue View File

113
                       >发票打印
113
                       >发票打印
114
                       </el-button>
114
                       </el-button>
115
                     </div>
115
                     </div>
116
-                    
116
+
117
 
117
 
118
 
118
 
119
                 </div>
119
                 </div>
544
         let params = {
544
         let params = {
545
           patient_id: this.patientInfo.id,
545
           patient_id: this.patientInfo.id,
546
           start_time: val,
546
           start_time: val,
547
-          end_time: this.other_end_time
547
+          end_time: this.other_end_time,
548
+          p_type:1
548
         };
549
         };
549
         getDayOrMonthHisPrescription(params).then(response => {
550
         getDayOrMonthHisPrescription(params).then(response => {
550
           if (response.data.state == 1) {
551
           if (response.data.state == 1) {
561
         let params = {
562
         let params = {
562
           patient_id: this.patientInfo.id,
563
           patient_id: this.patientInfo.id,
563
           start_time: this.other_start_time,
564
           start_time: this.other_start_time,
564
-          end_time: val
565
+          end_time: val,
566
+          p_type:1
565
         };
567
         };
566
         getDayOrMonthHisPrescription(params).then(response => {
568
         getDayOrMonthHisPrescription(params).then(response => {
567
           if (response.data.state == 1) {
569
           if (response.data.state == 1) {
2814
 
2816
 
2815
       },
2817
       },
2816
       invoicePrint(obj){
2818
       invoicePrint(obj){
2817
-        console.log(this.hisPatientInfo)
2819
+        console.log(this.hisPatientInfo);
2818
         let paramsObj = {
2820
         let paramsObj = {
2819
           order_id: this.hisPatientInfo.id,
2821
           order_id: this.hisPatientInfo.id,
2820
           patient_id: this.hisPatientInfo.patient_id,
2822
           patient_id: this.hisPatientInfo.patient_id,
2821
           name:this.hisPatientInfo.name,
2823
           name:this.hisPatientInfo.name,
2822
           gend:this.hisPatientInfo.gend,
2824
           gend:this.hisPatientInfo.gend,
2823
           setl_time:this.hisPatientInfo.out_hosptial_time
2825
           setl_time:this.hisPatientInfo.out_hosptial_time
2824
-        }
2825
-        this.invoiceParams = paramsObj
2826
+        };
2827
+        this.invoiceParams = paramsObj;
2826
         this.invoiceVisible = true
2828
         this.invoiceVisible = true
2827
       }
2829
       }
2828
     },
2830
     },

+ 48 - 48
src/xt_pages/outpatientCharges/11.vue View File

117
   import { getPatientInformation, getPatientList } from '@/api/project/project'
117
   import { getPatientInformation, getPatientList } from '@/api/project/project'
118
   import { getPatientInfo, getSchedulePatientList, register,upload } from '@/api/his/his'
118
   import { getPatientInfo, getSchedulePatientList, register,upload } from '@/api/his/his'
119
 
119
 
120
-  const moment = require('moment')
120
+  const moment = require('moment');
121
   export default {
121
   export default {
122
     components: {
122
     components: {
123
       BreadCrumb,
123
       BreadCrumb,
161
       }
161
       }
162
     },
162
     },
163
     created() {
163
     created() {
164
-      var nowDate = new Date()
165
-      var nowYear = nowDate.getFullYear()
166
-      var nowMonth = nowDate.getMonth() + 1
167
-      var nowDay = nowDate.getDate()
164
+      var nowDate = new Date();
165
+      var nowYear = nowDate.getFullYear();
166
+      var nowMonth = nowDate.getMonth() + 1;
167
+      var nowDay = nowDate.getDate();
168
       this.record_date =
168
       this.record_date =
169
         nowYear +
169
         nowYear +
170
         '-' +
170
         '-' +
171
         (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
171
         (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
172
         '-' +
172
         '-' +
173
-        (nowDay < 10 ? '0' + nowDay : nowDay)
173
+        (nowDay < 10 ? '0' + nowDay : nowDay);
174
 
174
 
175
       //获取患者信息
175
       //获取患者信息
176
       this.getPatientList()
176
       this.getPatientList()
179
       tabclickEvent(val) {
179
       tabclickEvent(val) {
180
         for (let i = 0; i < this.prescriptions.length; i++) {
180
         for (let i = 0; i < this.prescriptions.length; i++) {
181
           if (this.prescriptions[i].name == val.name) {
181
           if (this.prescriptions[i].name == val.name) {
182
-            this.curPrescriptions = {}
183
-            var temp = this.deepClone(this.prescriptions[i])
184
-            this.curPrescriptions = temp
182
+            this.curPrescriptions = {};
183
+            var temp = this.deepClone(this.prescriptions[i]);
184
+            this.curPrescriptions = temp;
185
             console.log(this.curPrescriptions)
185
             console.log(this.curPrescriptions)
186
           }
186
           }
187
         }
187
         }
189
         if (!source && typeof source !== 'object') {
189
         if (!source && typeof source !== 'object') {
190
           throw new Error('error arguments', 'shallowClone')
190
           throw new Error('error arguments', 'shallowClone')
191
         }
191
         }
192
-        const targetObj = source.constructor === Array ? [] : {}
192
+        const targetObj = source.constructor === Array ? [] : {};
193
         Object.keys(source).forEach((keys) => {
193
         Object.keys(source).forEach((keys) => {
194
           if (source[keys] && typeof source[keys] === 'object') {
194
           if (source[keys] && typeof source[keys] === 'object') {
195
             targetObj[keys] = this.deepClone(source[keys])
195
             targetObj[keys] = this.deepClone(source[keys])
196
           } else {
196
           } else {
197
             targetObj[keys] = source[keys]
197
             targetObj[keys] = source[keys]
198
           }
198
           }
199
-        })
199
+        });
200
         return targetObj
200
         return targetObj
201
       },
201
       },
202
       getTotal() {
202
       getTotal() {
203
-        var total = 0
204
-        console.log(this.prescriptions)
203
+        var total = 0;
204
+        console.log(this.prescriptions);
205
         for (let i = 0; i < this.prescriptions.length; i++) {
205
         for (let i = 0; i < this.prescriptions.length; i++) {
206
           if (this.prescriptions[i].advices != null) {
206
           if (this.prescriptions[i].advices != null) {
207
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
207
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
230
           let params = {
230
           let params = {
231
             'id': this.patientInfo.id,
231
             'id': this.patientInfo.id,
232
             'record_time': this.record_date
232
             'record_time': this.record_date
233
-          }
234
-          this.loadingtwo = true
233
+          };
234
+          this.loadingtwo = true;
235
           upload(params).then(response => {
235
           upload(params).then(response => {
236
             if (response.data.state == 0) {
236
             if (response.data.state == 0) {
237
-              this.$message.error(response.data.msg)
238
-              this.loadingtwo = false
237
+              this.$message.error(response.data.msg);
238
+              this.loadingtwo = false;
239
 
239
 
240
               return false
240
               return false
241
 
241
 
243
               this.loadingtwo = false
243
               this.loadingtwo = false
244
 
244
 
245
             }
245
             }
246
-          })
246
+          });
247
 
247
 
248
-          this.state = '已收费'
248
+          this.state = '已收费';
249
           this.$message({ message: '收费成功', type: 'success' })
249
           this.$message({ message: '收费成功', type: 'success' })
250
         } else if (index == 5) {
250
         } else if (index == 5) {
251
           this.$message({ message: '退费成功', type: 'success' })
251
           this.$message({ message: '退费成功', type: 'success' })
252
         } else if (index == 6) {
252
         } else if (index == 6) {
253
 
253
 
254
           if (this.patientInfo.id == 0) {
254
           if (this.patientInfo.id == 0) {
255
-            this.$message.error('请先选择要挂号的病人')
255
+            this.$message.error('请先选择要挂号的病人');
256
             return
256
             return
257
           }
257
           }
258
           let params = {
258
           let params = {
259
             'id': this.patientInfo.id,
259
             'id': this.patientInfo.id,
260
             'record_time': this.record_date
260
             'record_time': this.record_date
261
-          }
262
-          this.loadingone = true
261
+          };
262
+          this.loadingone = true;
263
           register(params).then(response => {
263
           register(params).then(response => {
264
             if (response.data.state == 0) {
264
             if (response.data.state == 0) {
265
-              this.$message.error(response.data.msg)
266
-              this.loadingone = false
265
+              this.$message.error(response.data.msg);
266
+              this.loadingone = false;
267
 
267
 
268
               return false
268
               return false
269
 
269
 
270
             } else {
270
             } else {
271
-              this.loadingone = false
272
-              var his_info = response.data.data.his_info
271
+              this.loadingone = false;
272
+              var his_info = response.data.data.his_info;
273
               this.hisPatientInfo = his_info
273
               this.hisPatientInfo = his_info
274
             }
274
             }
275
           })
275
           })
276
         }
276
         }
277
       },
277
       },
278
       addTab(targetName) {
278
       addTab(targetName) {
279
-        let newTabName = ++this.tabIndex + ''
279
+        let newTabName = ++this.tabIndex + '';
280
         this.editableTabs.push({
280
         this.editableTabs.push({
281
           title: '处方' + this.tabIndex,
281
           title: '处方' + this.tabIndex,
282
           name: newTabName
282
           name: newTabName
283
-        })
283
+        });
284
         this.editableTabsValue = newTabName
284
         this.editableTabsValue = newTabName
285
       },
285
       },
286
       removeTab(targetName) {
286
       removeTab(targetName) {
287
-        let tabs = this.editableTabs
288
-        let activeName = this.editableTabsValue
287
+        let tabs = this.editableTabs;
288
+        let activeName = this.editableTabsValue;
289
         if (activeName === targetName) {
289
         if (activeName === targetName) {
290
           tabs.forEach((tab, index) => {
290
           tabs.forEach((tab, index) => {
291
             if (tab.name === targetName) {
291
             if (tab.name === targetName) {
292
-              let nextTab = tabs[index + 1] || tabs[index - 1]
292
+              let nextTab = tabs[index + 1] || tabs[index - 1];
293
               if (nextTab) {
293
               if (nextTab) {
294
                 activeName = nextTab.name
294
                 activeName = nextTab.name
295
               }
295
               }
297
           })
297
           })
298
         }
298
         }
299
 
299
 
300
-        this.editableTabsValue = activeName
300
+        this.editableTabsValue = activeName;
301
         this.editableTabs = tabs.filter(tab => tab.name !== targetName)
301
         this.editableTabs = tabs.filter(tab => tab.name !== targetName)
302
       },
302
       },
303
       addCharges() {
303
       addCharges() {
307
 
307
 
308
       },
308
       },
309
       changeRadio(id) {
309
       changeRadio(id) {
310
-        console.log(id)
311
-        this.radioStatus = id
310
+        console.log(id);
311
+        this.radioStatus = id;
312
         this.getPatientList()
312
         this.getPatientList()
313
       },
313
       },
314
 
314
 
316
       getPatientList() {
316
       getPatientList() {
317
         let params = {
317
         let params = {
318
           'record_date': this.record_date
318
           'record_date': this.record_date
319
-        }
319
+        };
320
         getSchedulePatientList(params).then(response => {
320
         getSchedulePatientList(params).then(response => {
321
           if (response.data.state == 0) {
321
           if (response.data.state == 0) {
322
-            this.$message.error(response.data.msg)
322
+            this.$message.error(response.data.msg);
323
             return false
323
             return false
324
           } else {
324
           } else {
325
-            this.patientTableData = []
325
+            this.patientTableData = [];
326
             // let cal_one = 0
326
             // let cal_one = 0
327
             // let cal_two = 0
327
             // let cal_two = 0
328
             for (let i = 0; i < response.data.data.list.length; i++) {
328
             for (let i = 0; i < response.data.data.list.length; i++) {
342
       },
342
       },
343
 
343
 
344
       unique(arr) {
344
       unique(arr) {
345
-        const res = new Map()
345
+        const res = new Map();
346
         return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
346
         return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
347
       },
347
       },
348
       handleCurrentChange(val) {
348
       handleCurrentChange(val) {
351
       getPatientInformation(id) {
351
       getPatientInformation(id) {
352
         let params = {
352
         let params = {
353
           'record_date': this.record_date,
353
           'record_date': this.record_date,
354
-          'patient_id': id
355
-        }
354
+          'patient_id': id,
355
+        };
356
         getPatientInfo(params).then(response => {
356
         getPatientInfo(params).then(response => {
357
           if (response.data.state == 0) {
357
           if (response.data.state == 0) {
358
-            this.$message.error(response.data.msg)
358
+            this.$message.error(response.data.msg);
359
             return false
359
             return false
360
           } else {
360
           } else {
361
-            this.patientInfo = response.data.data.xt_info
362
-            this.hisPatientInfo = response.data.data.his_info
363
-            this.prescriptions = []
361
+            this.patientInfo = response.data.data.xt_info;
362
+            this.hisPatientInfo = response.data.data.his_info;
363
+            this.prescriptions = [];
364
             for (let i = 0; i < response.data.data.prescription.length; i++) {
364
             for (let i = 0; i < response.data.data.prescription.length; i++) {
365
-              var prescription = response.data.data.prescription[i]
366
-              let index = i + 1
365
+              var prescription = response.data.data.prescription[i];
366
+              let index = i + 1;
367
               let obj = {
367
               let obj = {
368
                 name: '处方' + index,
368
                 name: '处方' + index,
369
                 advices: prescription.advices,
369
                 advices: prescription.advices,
370
                 project: prescription.project,
370
                 project: prescription.project,
371
                 type: response.data.data.prescription[i].type
371
                 type: response.data.data.prescription[i].type
372
-              }
373
-              this.prescriptions.push(obj)
372
+              };
373
+              this.prescriptions.push(obj);
374
               this.curPrescriptions = this.prescriptions[0]
374
               this.curPrescriptions = this.prescriptions[0]
375
 
375
 
376
             }
376
             }

File diff suppressed because it is too large
+ 525 - 521
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue


+ 33 - 30
src/xt_pages/outpatientDoctorStation/components/callPrescription.vue View File

188
         let params={
188
         let params={
189
           patient_id:this.patient_id,
189
           patient_id:this.patient_id,
190
           start_time: this.start_time,
190
           start_time: this.start_time,
191
-          end_time:this.end_time
192
-        }
191
+          end_time:this.end_time,
192
+          p_type:2,
193
+        };
193
         this.GetCallHisPrescription(params)
194
         this.GetCallHisPrescription(params)
194
       },changeEndTime(){
195
       },changeEndTime(){
195
         let params={
196
         let params={
196
           patient_id:this.patient_id,
197
           patient_id:this.patient_id,
197
           start_time: this.start_time,
198
           start_time: this.start_time,
198
-          end_time:this.end_time
199
-        }
199
+          end_time:this.end_time,
200
+          p_type:2,
201
+
202
+        };
200
         this.GetCallHisPrescription(params)
203
         this.GetCallHisPrescription(params)
201
       },
204
       },
202
       GetCallHisPrescription(params){
205
       GetCallHisPrescription(params){
203
         getCallHisPrescription(params).then(response => {
206
         getCallHisPrescription(params).then(response => {
204
           if (response.data.state == 1) {
207
           if (response.data.state == 1) {
205
-            this.allPrescription = response.data.data.prescriptions
208
+            this.allPrescription = response.data.data.prescriptions;
206
             for (let i = 0; i < this.allPrescription.length; i++){
209
             for (let i = 0; i < this.allPrescription.length; i++){
207
               this.allPrescription[i].check_group = []
210
               this.allPrescription[i].check_group = []
208
             }
211
             }
214
         })
217
         })
215
       },
218
       },
216
       save() {
219
       save() {
217
-        let replace_one = []
218
-        let replace_two = []
220
+        let replace_one = [];
221
+        let replace_two = [];
219
 
222
 
220
-        let checkGroup = []
221
-        let allPrescriptions = []
222
-        let targetPrescriptions = []
223
-        let prescriptions = []
223
+        let checkGroup = [];
224
+        let allPrescriptions = [];
225
+        let targetPrescriptions = [];
226
+        let prescriptions = [];
224
         for (let i = 0; i < this.allPrescription.length; i++) {
227
         for (let i = 0; i < this.allPrescription.length; i++) {
225
           for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
228
           for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
226
             checkGroup.push(this.allPrescription[i].check_group[a])
229
             checkGroup.push(this.allPrescription[i].check_group[a])
239
 
242
 
240
         if (targetPrescriptions.length > 0) {
243
         if (targetPrescriptions.length > 0) {
241
           for (let i = 0; i < targetPrescriptions.length; i++) {
244
           for (let i = 0; i < targetPrescriptions.length; i++) {
242
-            var prescription = targetPrescriptions[i]
243
-            let tempAdvice = []
244
-            let tempProject = []
245
-            let tempAddition = []
245
+            var prescription = targetPrescriptions[i];
246
+            let tempAdvice = [];
247
+            let tempProject = [];
248
+            let tempAddition = [];
246
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
249
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
247
               let obj = {
250
               let obj = {
248
                 advice_id: 0,
251
                 advice_id: 0,
258
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
261
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
259
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
262
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
260
                 id:prescription.doctor_advice[b].drug_id
263
                 id:prescription.doctor_advice[b].drug_id
261
-              }
264
+              };
262
               tempAdvice.push(obj)
265
               tempAdvice.push(obj)
263
 
266
 
264
             }
267
             }
278
                 price:prescription.project[b].price,
281
                 price:prescription.project[b].price,
279
                 remark:prescription.project[b].remark,
282
                 remark:prescription.project[b].remark,
280
                 medical_code:prescription.project[b].project.medical_code,
283
                 medical_code:prescription.project[b].project.medical_code,
281
-              }
284
+              };
282
               tempProject.push(obj)
285
               tempProject.push(obj)
283
             }
286
             }
284
             let obj = {
287
             let obj = {
288
               addition:tempAddition,
291
               addition:tempAddition,
289
               type:prescription.type,
292
               type:prescription.type,
290
               order_status:0,
293
               order_status:0,
291
-            }
294
+            };
292
             prescriptions.push(obj)
295
             prescriptions.push(obj)
293
           }
296
           }
294
         }
297
         }
295
 
298
 
296
         if(this.srcPrescriptions.length == 1){
299
         if(this.srcPrescriptions.length == 1){
297
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){
300
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){
298
-            this.srcPrescriptions = []
299
-            this.srcPrescriptions = prescriptions
301
+            this.srcPrescriptions = [];
302
+            this.srcPrescriptions = prescriptions;
300
             this.$emit('call', this.srcPrescriptions)
303
             this.$emit('call', this.srcPrescriptions)
301
           }else{
304
           }else{
302
 
305
 
303
-            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
306
+            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
304
             this.$emit('call', this.srcPrescriptions)
307
             this.$emit('call', this.srcPrescriptions)
305
           }
308
           }
306
         }else{
309
         }else{
307
-          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
310
+          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
308
           this.$emit('call', this.srcPrescriptions)
311
           this.$emit('call', this.srcPrescriptions)
309
         }
312
         }
310
       },show(name,id,end_time, start_time,srcPrescriptions,prescriptions){
313
       },show(name,id,end_time, start_time,srcPrescriptions,prescriptions){
311
-        this.srcPrescriptions = srcPrescriptions
312
-        this.start_time  = start_time
313
-        this.end_time = end_time
314
-        this.patient_id = id
315
-        this.name = '处方调用' + '('+name +')'
316
-        this.allPrescription = prescriptions
314
+        this.srcPrescriptions = srcPrescriptions;
315
+        this.start_time  = start_time;
316
+        this.end_time = end_time;
317
+        this.patient_id = id;
318
+        this.name = '处方调用' + '('+name +')';
319
+        this.allPrescription = prescriptions;
317
         for (let i = 0; i < this.allPrescription.length; i++){
320
         for (let i = 0; i < this.allPrescription.length; i++){
318
           this.allPrescription[i].check_group = []
321
           this.allPrescription[i].check_group = []
319
         }
322
         }
327
         return uParseTime(time,template)
330
         return uParseTime(time,template)
328
 
331
 
329
       }, getGroup(id){
332
       }, getGroup(id){
330
-        var name = ""
331
-        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
333
+        var name = "";
334
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category');
332
         for(let i=0;i<statistics_category.length;i++){
335
         for(let i=0;i<statistics_category.length;i++){
333
           if(id == statistics_category[i].id){
336
           if(id == statistics_category[i].id){
334
             name = statistics_category[i].name
337
             name = statistics_category[i].name

+ 17 - 9
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

425
     getDayOrMonthHisPrescription,
425
     getDayOrMonthHisPrescription,
426
     getInitData,
426
     getInitData,
427
     getNextOrLastHisPrescription,
427
     getNextOrLastHisPrescription,
428
-    getPatientInfo,
429
-    getSchedulePatientList
430
   } from '@/api/his/his'
428
   } from '@/api/his/his'
431
   import { getDictionaryDataConfig } from '@/utils/data'
429
   import { getDictionaryDataConfig } from '@/utils/data'
432
   import prescriptionTable from './prescriptionTable'
430
   import prescriptionTable from './prescriptionTable'
967
         let params = {
965
         let params = {
968
           patient_id: this.patientInfo.id,
966
           patient_id: this.patientInfo.id,
969
           start_time: val,
967
           start_time: val,
970
-          end_time: this.end_time
968
+          end_time: this.end_time,
969
+          p_type:2
971
         };
970
         };
972
         getDayOrMonthHisPrescription(params).then(response => {
971
         getDayOrMonthHisPrescription(params).then(response => {
973
           if (response.data.state == 1) {
972
           if (response.data.state == 1) {
1070
         let params = {
1069
         let params = {
1071
           patient_id: this.patientInfo.id,
1070
           patient_id: this.patientInfo.id,
1072
           start_time: this.start_time,
1071
           start_time: this.start_time,
1073
-          end_time: val
1072
+          end_time: val,
1073
+          p_type:2
1074
+
1075
+
1074
         };
1076
         };
1075
         getDayOrMonthHisPrescription(params).then(response => {
1077
         getDayOrMonthHisPrescription(params).then(response => {
1076
           if (response.data.state == 1) {
1078
           if (response.data.state == 1) {
1295
           let params = {
1297
           let params = {
1296
             patient_id: this.patientInfo.id,
1298
             patient_id: this.patientInfo.id,
1297
             record_time: this.request_record_date,
1299
             record_time: this.request_record_date,
1298
-            type: 1
1300
+            type: 1,
1301
+            p_type:2,
1302
+
1299
           };
1303
           };
1300
 
1304
 
1301
           this.GetNextOrLastHisPrescription(params)
1305
           this.GetNextOrLastHisPrescription(params)
1303
           let params = {
1307
           let params = {
1304
             patient_id: this.patientInfo.id,
1308
             patient_id: this.patientInfo.id,
1305
             record_time: this.request_record_date,
1309
             record_time: this.request_record_date,
1306
-            type: 1
1310
+            type: 1,
1311
+            p_type:2,
1307
           };
1312
           };
1308
 
1313
 
1309
           this.GetNextOrLastHisPrescription(params)
1314
           this.GetNextOrLastHisPrescription(params)
1326
           let params = {
1331
           let params = {
1327
             patient_id: this.patientInfo.id,
1332
             patient_id: this.patientInfo.id,
1328
             record_time: this.request_record_date,
1333
             record_time: this.request_record_date,
1329
-            type: 2
1334
+            type: 2,
1335
+            p_type:2,
1330
           };
1336
           };
1331
 
1337
 
1332
           this.GetNextOrLastHisPrescription(params)
1338
           this.GetNextOrLastHisPrescription(params)
1334
           let params = {
1340
           let params = {
1335
             patient_id: this.patientInfo.id,
1341
             patient_id: this.patientInfo.id,
1336
             record_time: this.request_record_date,
1342
             record_time: this.request_record_date,
1337
-            type: 2
1343
+            type: 2,
1344
+            p_type:2,
1338
           };
1345
           };
1339
           this.GetNextOrLastHisPrescription(params)
1346
           this.GetNextOrLastHisPrescription(params)
1340
 
1347
 
1837
           let params = {
1844
           let params = {
1838
             end_time: this.record_date,
1845
             end_time: this.record_date,
1839
             start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1846
             start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
1840
-            patient_id: this.patientInfo.id
1847
+            patient_id: this.patientInfo.id,
1848
+            p_type:2,
1841
           };
1849
           };
1842
           getCallHisPrescription(params).then(response => {
1850
           getCallHisPrescription(params).then(response => {
1843
             if (response.data.state == 1) {
1851
             if (response.data.state == 1) {

+ 34 - 31
src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue View File

239
           let params = {
239
           let params = {
240
             patient_id: this.patient_id,
240
             patient_id: this.patient_id,
241
             record_time: this.request_record_date,
241
             record_time: this.request_record_date,
242
-            type: 1
243
-          }
242
+            type: 1,
243
+            p_type:2,
244
+          };
244
 
245
 
245
           this.GetNextOrLastHisPrescription(params)
246
           this.GetNextOrLastHisPrescription(params)
246
 
247
 
251
           let params = {
252
           let params = {
252
             patient_id: this.patient_id,
253
             patient_id: this.patient_id,
253
             record_time: this.request_record_date,
254
             record_time: this.request_record_date,
254
-            type: 2
255
-          }
255
+            type: 2,
256
+            p_type:2,
257
+
258
+          };
256
           this.GetNextOrLastHisPrescription(params)
259
           this.GetNextOrLastHisPrescription(params)
257
         }
260
         }
258
       },
261
       },
259
       GetNextOrLastHisPrescription(params){
262
       GetNextOrLastHisPrescription(params){
260
         getNextOrLastHisPrescription(params).then(response => {
263
         getNextOrLastHisPrescription(params).then(response => {
261
           if (response.data.state == 1) {
264
           if (response.data.state == 1) {
262
-            this.allPrescription = response.data.data.prescriptions
265
+            this.allPrescription = response.data.data.prescriptions;
263
             for (let i = 0; i < this.allPrescription.length; i++){
266
             for (let i = 0; i < this.allPrescription.length; i++){
264
               this.allPrescription[i].check_group = []
267
               this.allPrescription[i].check_group = []
265
             }
268
             }
271
         })
274
         })
272
       },
275
       },
273
       save() {
276
       save() {
274
-        let replace_one = []
275
-        let replace_two = []
277
+        let replace_one = [];
278
+        let replace_two = [];
276
 
279
 
277
-        let checkGroup = []
278
-        let allPrescriptions = []
279
-        let targetPrescriptions = []
280
-        let prescriptions = []
280
+        let checkGroup = [];
281
+        let allPrescriptions = [];
282
+        let targetPrescriptions = [];
283
+        let prescriptions = [];
281
         for (let i = 0; i < this.allPrescription.length; i++) {
284
         for (let i = 0; i < this.allPrescription.length; i++) {
282
           for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
285
           for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
283
             checkGroup.push(this.allPrescription[i].check_group[a])
286
             checkGroup.push(this.allPrescription[i].check_group[a])
296
 
299
 
297
         if (targetPrescriptions.length > 0) {
300
         if (targetPrescriptions.length > 0) {
298
           for (let i = 0; i < targetPrescriptions.length; i++) {
301
           for (let i = 0; i < targetPrescriptions.length; i++) {
299
-            var prescription = targetPrescriptions[i]
300
-            let tempAdvice = []
301
-            let tempProject = []
302
-            let tempAddition = []
302
+            var prescription = targetPrescriptions[i];
303
+            let tempAdvice = [];
304
+            let tempProject = [];
305
+            let tempAddition = [];
303
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
306
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
304
               let obj = {
307
               let obj = {
305
                 advice_id: 0,
308
                 advice_id: 0,
315
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
318
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
316
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
319
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
317
                 id:prescription.doctor_advice[b].drug_id
320
                 id:prescription.doctor_advice[b].drug_id
318
-              }
321
+              };
319
               tempAdvice.push(obj)
322
               tempAdvice.push(obj)
320
 
323
 
321
             }
324
             }
335
                 price:prescription.project[b].price,
338
                 price:prescription.project[b].price,
336
                 remark:prescription.project[b].remark,
339
                 remark:prescription.project[b].remark,
337
                 medical_code:prescription.project[b].project.medical_code,
340
                 medical_code:prescription.project[b].project.medical_code,
338
-              }
341
+              };
339
               tempProject.push(obj)
342
               tempProject.push(obj)
340
             }
343
             }
341
             let obj = {
344
             let obj = {
345
               addition:tempAddition,
348
               addition:tempAddition,
346
               order_status:0,
349
               order_status:0,
347
               // type: type,
350
               // type: type,
348
-            }
351
+            };
349
             prescriptions.push(obj)
352
             prescriptions.push(obj)
350
           }
353
           }
351
         }
354
         }
352
 
355
 
353
-        console.log(this.srcPrescriptions)
356
+        console.log(this.srcPrescriptions);
354
 
357
 
355
         if(this.srcPrescriptions.length == 1){
358
         if(this.srcPrescriptions.length == 1){
356
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){
359
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){
357
-            this.srcPrescriptions = []
358
-            this.srcPrescriptions = prescriptions
360
+            this.srcPrescriptions = [];
361
+            this.srcPrescriptions = prescriptions;
359
             this.$emit('save', this.srcPrescriptions)
362
             this.$emit('save', this.srcPrescriptions)
360
           }else{
363
           }else{
361
 
364
 
362
-            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
365
+            this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
363
             this.$emit('save', this.srcPrescriptions)
366
             this.$emit('save', this.srcPrescriptions)
364
           }
367
           }
365
         }else{
368
         }else{
366
-          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions)
369
+          this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
367
           this.$emit('save', this.srcPrescriptions)
370
           this.$emit('save', this.srcPrescriptions)
368
         }
371
         }
369
 
372
 
370
 
373
 
371
 
374
 
372
       },show(prescriptions,name,id,srcPrescriptions){
375
       },show(prescriptions,name,id,srcPrescriptions){
373
-        this.srcPrescriptions = srcPrescriptions
374
-        this.patient_id = id
375
-        this.request_record_date = uParseTime(prescriptions[0].record_date, '{y}-{m}-{d}')
376
-        this.name = name
377
-        this.allPrescription = prescriptions
376
+        this.srcPrescriptions = srcPrescriptions;
377
+        this.patient_id = id;
378
+        this.request_record_date = uParseTime(prescriptions[0].record_date, '{y}-{m}-{d}');
379
+        this.name = name;
380
+        this.allPrescription = prescriptions;
378
         for (let i = 0; i < this.allPrescription.length; i++){
381
         for (let i = 0; i < this.allPrescription.length; i++){
379
           this.allPrescription[i].check_group = []
382
           this.allPrescription[i].check_group = []
380
         }
383
         }
381
-        console.log(this.allPrescription)
384
+        console.log(this.allPrescription);
382
         this.isLastOrNextVisible = true
385
         this.isLastOrNextVisible = true
383
       },close(){
386
       },close(){
384
         this.isLastOrNextVisible = false
387
         this.isLastOrNextVisible = false
389
         return uParseTime(time,template)
392
         return uParseTime(time,template)
390
 
393
 
391
       }, getGroup(id){
394
       }, getGroup(id){
392
-        var name = ""
393
-        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
395
+        var name = "";
396
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category');
394
         for(let i=0;i<statistics_category.length;i++){
397
         for(let i=0;i<statistics_category.length;i++){
395
           if(id == statistics_category[i].id){
398
           if(id == statistics_category[i].id){
396
             name = statistics_category[i].name
399
             name = statistics_category[i].name

File diff suppressed because it is too large
+ 362 - 351
src/xt_pages/outpatientDoctorStation/doctorDesk.vue