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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -541,6 +541,7 @@ export default {
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       register: [
         { value: 11, label: '普通门诊' },
+        { value: 1102, label: '新冠门诊' },
         // { value: 12, label: '门诊挂号' },
         // { value: 13, label: '急诊' },
         { value: 14, label: '门诊特殊病' },
@@ -2364,7 +2365,7 @@ export default {
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
-                  
+
 
                 }
 
@@ -2565,7 +2566,7 @@ export default {
                           if(this.prescriptions[i].project[j].type == 3){
                             project_arr.push(this.prescriptions[i].project[j])
                           }
-                          
+
                         }
                       }
                     }
@@ -2595,8 +2596,8 @@ export default {
                             }
                           }
                         }
-                      
-                        
+
+
                         for(let i=0;i<newProjectArr.length;i++){
                           for(let j=0;j<newProjectArr[i].child.length;j++){
                             newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
@@ -2608,13 +2609,13 @@ export default {
                                 this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
                                 isLoading = false
                                 this.$emit('editKeepLoad', false)
-                                return 
-                          } 
+                                return
+                          }
                         }
 
-                      }  
+                      }
                     }
-           
+
                 }
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -219,6 +219,7 @@
       return {
         registers: [
           { value: 11, label: '普通门诊' },
+          { value: 1102, label: '新冠门诊' },
           // {value: 12, label: '门诊挂号'},
           // {value: 13, label: "急诊"},
           { value: 14, label: '门诊特殊病' }

src/xt_pages/hospitalStation/components/registerDialog9504.vue

@@ -186,6 +186,7 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
+          { value: 1102, label: '新冠门诊' },
           // {value: 12, label: '门诊挂号'},
           // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -237,6 +237,7 @@
       return {
         registers: [
           { value: 11, label: '普通门诊' },
+          { value: 1102, label: '新冠门诊' },
           // { value: 12, label: '门诊挂号' },
           // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -191,6 +191,7 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
+          { value: 1102, label: '新冠门诊' },
           // {value: 12, label: '门诊挂号'},
           // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -975,6 +975,7 @@ export default {
       // ],
       register: [
         { value: 11, label: '普通门诊' },
+        { value: 1102, label: '新冠门诊' },
         { value: 14, label: '门诊特殊病' },
         { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
@@ -984,6 +985,7 @@ export default {
 
       registerThree: [
         { value: 11, label: '普通门诊' },
+        { value: 1102, label: '新冠门诊' },
         { value: 14, label: '门诊特殊病' },
         { value: '9922', label: '家庭通道' },
         { value: '9933', label: '门诊特殊病(9933)' },
@@ -996,6 +998,7 @@ export default {
       ],
       register_two: [
         { value: '11', label: '普通门诊' },
+        { value: '1102', label: '新冠门诊' },
         { value: '14', label: '门诊特殊病' },
         { value: '9922', label: '家庭通道' },
         { value: '9933', label: '门诊特殊病(9933)' },
@@ -4330,6 +4333,10 @@ export default {
         case 11:
           return '普通门诊' + '处方' + index
 
+          break
+        case 1102:
+          return '新冠门诊' + '处方' + index
+
           break
         case 12:
           return '门诊挂号' + '处方' + index

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -537,7 +537,9 @@
         start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         register: [
+
           { value: 11, label: '普通门诊' },
+          { value: 1102, label: '新冠门诊' },
           { value: 14, label: '门诊特殊病' },
           { value: 9922, label: '家庭通道' },
           { value: 9933, label: '门诊特殊病(9933)' },
@@ -552,6 +554,8 @@
         ],
         medical_care: [
           { value: 11, label: '普通门诊' },
+          { value: 1102, label: '新冠门诊' },
+
           { value: 12, label: '家庭通道' },
           { value: 13, label: '门诊大病' },
           { value: 14, label: '重疾特药' },
@@ -2366,7 +2370,7 @@
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
-                 
+
 
                 }
 
@@ -2423,9 +2427,9 @@
               if (num == 0) {
                 var arr = []//新增处方
                 var arr_one = []
-               
+
                 console.log("ooo233323233232323232",this.prescriptions)
-                
+
                //药品
                 for(let i=0;i<this.prescriptions.length;i++){
                   if(this.prescriptions[i].id == 0){
@@ -2557,11 +2561,11 @@
 
                         }
                       }
-                     
+
                     }
                   }
                 }
-               
+
                if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
                   var project_arr = []
                   //耗材
@@ -2571,7 +2575,7 @@
                         if(this.prescriptions[i].project[j].type ==3){
                           project_arr.push(this.prescriptions[i].project[j])
                         }
-                        
+
                       }
                     }
                   }
@@ -2601,8 +2605,8 @@
                           }
                         }
                       }
-                    
-                      
+
+
                       for(let i=0;i<newProjectArr.length;i++){
                         for(let j=0;j<newProjectArr[i].child.length;j++){
                           newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
@@ -2614,13 +2618,13 @@
                               this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
                               isLoading = false
                               this.$emit('editKeepLoad', false)
-                              return 
-                        } 
+                              return
+                        }
                       }
-                      
+
                     }
                }
-           
+
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {
                     this.$emit('change', this.patientInfo.id)
@@ -2697,7 +2701,7 @@
                   month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
                   month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
 
-                  
+
 
                 }