Browse Source

Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

XMLWAN 1 year ago
parent
commit
f94fa1c11d

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

541
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
541
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
542
       register: [
542
       register: [
543
         { value: 11, label: '普通门诊' },
543
         { value: 11, label: '普通门诊' },
544
+        { value: 1102, label: '新冠门诊' },
544
         // { value: 12, label: '门诊挂号' },
545
         // { value: 12, label: '门诊挂号' },
545
         // { value: 13, label: '急诊' },
546
         // { value: 13, label: '急诊' },
546
         { value: 14, label: '门诊特殊病' },
547
         { value: 14, label: '门诊特殊病' },
2364
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
2365
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
2365
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
2366
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
2366
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
2367
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
2367
-                  
2368
+
2368
 
2369
 
2369
                 }
2370
                 }
2370
 
2371
 
2565
                           if(this.prescriptions[i].project[j].type == 3){
2566
                           if(this.prescriptions[i].project[j].type == 3){
2566
                             project_arr.push(this.prescriptions[i].project[j])
2567
                             project_arr.push(this.prescriptions[i].project[j])
2567
                           }
2568
                           }
2568
-                          
2569
+
2569
                         }
2570
                         }
2570
                       }
2571
                       }
2571
                     }
2572
                     }
2595
                             }
2596
                             }
2596
                           }
2597
                           }
2597
                         }
2598
                         }
2598
-                      
2599
-                        
2599
+
2600
+
2600
                         for(let i=0;i<newProjectArr.length;i++){
2601
                         for(let i=0;i<newProjectArr.length;i++){
2601
                           for(let j=0;j<newProjectArr[i].child.length;j++){
2602
                           for(let j=0;j<newProjectArr[i].child.length;j++){
2602
                             newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
2603
                             newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
2608
                                 this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
2609
                                 this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
2609
                                 isLoading = false
2610
                                 isLoading = false
2610
                                 this.$emit('editKeepLoad', false)
2611
                                 this.$emit('editKeepLoad', false)
2611
-                                return 
2612
-                          } 
2612
+                                return
2613
+                          }
2613
                         }
2614
                         }
2614
 
2615
 
2615
-                      }  
2616
+                      }
2616
                     }
2617
                     }
2617
-           
2618
+
2618
                 }
2619
                 }
2619
                 createHisPrescription(data, params).then(response => {
2620
                 createHisPrescription(data, params).then(response => {
2620
                   if (response.data.state == 1) {
2621
                   if (response.data.state == 1) {

+ 1 - 0
src/xt_pages/hospitalStation/components/registerDialog.vue View File

219
       return {
219
       return {
220
         registers: [
220
         registers: [
221
           { value: 11, label: '普通门诊' },
221
           { value: 11, label: '普通门诊' },
222
+          { value: 1102, label: '新冠门诊' },
222
           // {value: 12, label: '门诊挂号'},
223
           // {value: 12, label: '门诊挂号'},
223
           // {value: 13, label: "急诊"},
224
           // {value: 13, label: "急诊"},
224
           { value: 14, label: '门诊特殊病' }
225
           { value: 14, label: '门诊特殊病' }

+ 1 - 0
src/xt_pages/hospitalStation/components/registerDialog9504.vue View File

186
         read_loading:false,
186
         read_loading:false,
187
         registers: [
187
         registers: [
188
           {value: 11, label: "普通门诊"},
188
           {value: 11, label: "普通门诊"},
189
+          { value: 1102, label: '新冠门诊' },
189
           // {value: 12, label: '门诊挂号'},
190
           // {value: 12, label: '门诊挂号'},
190
           // {value: 13, label: "急诊"},
191
           // {value: 13, label: "急诊"},
191
           {value: 14, label: "门诊特殊病"},
192
           {value: 14, label: "门诊特殊病"},

+ 1 - 0
src/xt_pages/outpatientCharges/components/registerDialog.vue View File

237
       return {
237
       return {
238
         registers: [
238
         registers: [
239
           { value: 11, label: '普通门诊' },
239
           { value: 11, label: '普通门诊' },
240
+          { value: 1102, label: '新冠门诊' },
240
           // { value: 12, label: '门诊挂号' },
241
           // { value: 12, label: '门诊挂号' },
241
           // { value: 13, label: '急诊' },
242
           // { value: 13, label: '急诊' },
242
           { value: 14, label: '门诊特殊病' },
243
           { value: 14, label: '门诊特殊病' },

+ 1 - 0
src/xt_pages/outpatientCharges/components/registerDialog9504.vue View File

191
         read_loading:false,
191
         read_loading:false,
192
         registers: [
192
         registers: [
193
           {value: 11, label: "普通门诊"},
193
           {value: 11, label: "普通门诊"},
194
+          { value: 1102, label: '新冠门诊' },
194
           // {value: 12, label: '门诊挂号'},
195
           // {value: 12, label: '门诊挂号'},
195
           // {value: 13, label: "急诊"},
196
           // {value: 13, label: "急诊"},
196
           {value: 14, label: "门诊特殊病"},
197
           {value: 14, label: "门诊特殊病"},

+ 7 - 0
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

975
       // ],
975
       // ],
976
       register: [
976
       register: [
977
         { value: 11, label: '普通门诊' },
977
         { value: 11, label: '普通门诊' },
978
+        { value: 1102, label: '新冠门诊' },
978
         { value: 14, label: '门诊特殊病' },
979
         { value: 14, label: '门诊特殊病' },
979
         { value: '9922', label: '家庭通道' },
980
         { value: '9922', label: '家庭通道' },
980
         { value: '1111', label: '精一' },
981
         { value: '1111', label: '精一' },
984
 
985
 
985
       registerThree: [
986
       registerThree: [
986
         { value: 11, label: '普通门诊' },
987
         { value: 11, label: '普通门诊' },
988
+        { value: 1102, label: '新冠门诊' },
987
         { value: 14, label: '门诊特殊病' },
989
         { value: 14, label: '门诊特殊病' },
988
         { value: '9922', label: '家庭通道' },
990
         { value: '9922', label: '家庭通道' },
989
         { value: '9933', label: '门诊特殊病(9933)' },
991
         { value: '9933', label: '门诊特殊病(9933)' },
996
       ],
998
       ],
997
       register_two: [
999
       register_two: [
998
         { value: '11', label: '普通门诊' },
1000
         { value: '11', label: '普通门诊' },
1001
+        { value: '1102', label: '新冠门诊' },
999
         { value: '14', label: '门诊特殊病' },
1002
         { value: '14', label: '门诊特殊病' },
1000
         { value: '9922', label: '家庭通道' },
1003
         { value: '9922', label: '家庭通道' },
1001
         { value: '9933', label: '门诊特殊病(9933)' },
1004
         { value: '9933', label: '门诊特殊病(9933)' },
4330
         case 11:
4333
         case 11:
4331
           return '普通门诊' + '处方' + index
4334
           return '普通门诊' + '处方' + index
4332
 
4335
 
4336
+          break
4337
+        case 1102:
4338
+          return '新冠门诊' + '处方' + index
4339
+
4333
           break
4340
           break
4334
         case 12:
4341
         case 12:
4335
           return '门诊挂号' + '处方' + index
4342
           return '门诊挂号' + '处方' + index

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

537
         start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
537
         start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
538
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
538
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
539
         register: [
539
         register: [
540
+
540
           { value: 11, label: '普通门诊' },
541
           { value: 11, label: '普通门诊' },
542
+          { value: 1102, label: '新冠门诊' },
541
           { value: 14, label: '门诊特殊病' },
543
           { value: 14, label: '门诊特殊病' },
542
           { value: 9922, label: '家庭通道' },
544
           { value: 9922, label: '家庭通道' },
543
           { value: 9933, label: '门诊特殊病(9933)' },
545
           { value: 9933, label: '门诊特殊病(9933)' },
552
         ],
554
         ],
553
         medical_care: [
555
         medical_care: [
554
           { value: 11, label: '普通门诊' },
556
           { value: 11, label: '普通门诊' },
557
+          { value: 1102, label: '新冠门诊' },
558
+
555
           { value: 12, label: '家庭通道' },
559
           { value: 12, label: '家庭通道' },
556
           { value: 13, label: '门诊大病' },
560
           { value: 13, label: '门诊大病' },
557
           { value: 14, label: '重疾特药' },
561
           { value: 14, label: '重疾特药' },
2366
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
2370
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
2367
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
2371
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
2368
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
2372
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
2369
-                 
2373
+
2370
 
2374
 
2371
                 }
2375
                 }
2372
 
2376
 
2423
               if (num == 0) {
2427
               if (num == 0) {
2424
                 var arr = []//新增处方
2428
                 var arr = []//新增处方
2425
                 var arr_one = []
2429
                 var arr_one = []
2426
-               
2430
+
2427
                 console.log("ooo233323233232323232",this.prescriptions)
2431
                 console.log("ooo233323233232323232",this.prescriptions)
2428
-                
2432
+
2429
                //药品
2433
                //药品
2430
                 for(let i=0;i<this.prescriptions.length;i++){
2434
                 for(let i=0;i<this.prescriptions.length;i++){
2431
                   if(this.prescriptions[i].id == 0){
2435
                   if(this.prescriptions[i].id == 0){
2557
 
2561
 
2558
                         }
2562
                         }
2559
                       }
2563
                       }
2560
-                     
2564
+
2561
                     }
2565
                     }
2562
                   }
2566
                   }
2563
                 }
2567
                 }
2564
-               
2568
+
2565
                if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
2569
                if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
2566
                   var project_arr = []
2570
                   var project_arr = []
2567
                   //耗材
2571
                   //耗材
2571
                         if(this.prescriptions[i].project[j].type ==3){
2575
                         if(this.prescriptions[i].project[j].type ==3){
2572
                           project_arr.push(this.prescriptions[i].project[j])
2576
                           project_arr.push(this.prescriptions[i].project[j])
2573
                         }
2577
                         }
2574
-                        
2578
+
2575
                       }
2579
                       }
2576
                     }
2580
                     }
2577
                   }
2581
                   }
2601
                           }
2605
                           }
2602
                         }
2606
                         }
2603
                       }
2607
                       }
2604
-                    
2605
-                      
2608
+
2609
+
2606
                       for(let i=0;i<newProjectArr.length;i++){
2610
                       for(let i=0;i<newProjectArr.length;i++){
2607
                         for(let j=0;j<newProjectArr[i].child.length;j++){
2611
                         for(let j=0;j<newProjectArr[i].child.length;j++){
2608
                           newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
2612
                           newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
2614
                               this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
2618
                               this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
2615
                               isLoading = false
2619
                               isLoading = false
2616
                               this.$emit('editKeepLoad', false)
2620
                               this.$emit('editKeepLoad', false)
2617
-                              return 
2618
-                        } 
2621
+                              return
2622
+                        }
2619
                       }
2623
                       }
2620
-                      
2624
+
2621
                     }
2625
                     }
2622
                }
2626
                }
2623
-           
2627
+
2624
                 createHisPrescription(data, params).then(response => {
2628
                 createHisPrescription(data, params).then(response => {
2625
                   if (response.data.state == 1) {
2629
                   if (response.data.state == 1) {
2626
                     this.$emit('change', this.patientInfo.id)
2630
                     this.$emit('change', this.patientInfo.id)
2697
                   month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
2701
                   month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
2698
                   month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
2702
                   month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
2699
 
2703
 
2700
-                  
2704
+
2701
 
2705
 
2702
                 }
2706
                 }
2703
 
2707