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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1097,7 +1097,7 @@ export default {
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '1401', label: '门诊慢性病(1401)' },
-
+        { value: '2302', label: '异地就医(2302)' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
         { value: '0', label: '自费' }
@@ -1112,6 +1112,8 @@ export default {
         { value: '990602', label: '门诊特殊病(990602)' },
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '1401', label: '门诊慢性病(1401)' },
+        { value: '2302', label: '异地就医(2302)' },
+
 
         { value: '0', label: '自费' }
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -60,7 +60,7 @@
                   </el-form-item>
 
 
-                
+
 
 
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
@@ -563,6 +563,7 @@ export default {
         { value: 990602, label: '门诊特殊病(990602)' },
         { value: 1402, label: '门诊特殊病(1402)' },
         { value: 1401, label: '门诊慢特病(1401)' },
+        { value: 2302, label: '异地就医(2302)' },
         { value: 1111, label: '精一' },
         { value: 1112, label: '精二' },
         { value: 0, label: '自费' }
@@ -2077,7 +2078,7 @@ export default {
         }
 
       }
-      
+
       // console.log("info233333333333333333333",info.id)
       // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
       this.patient_diagnose = []
@@ -2094,13 +2095,13 @@ export default {
       }
 
       if(info.id > 0){
-       
+
         if (info.patient_diagnosis.length == 0) {
           this.patient_diagnose = []
         } else {
           this.patient_diagnose = []
           for (let i = 0; i < info.patient_diagnosis.split(",").length; i++) {
-           
+
             if(info.patient_diagnosis.split(',')[i].length > 0) {
               this.patient_diagnose.push(parseInt(info.patient_diagnosis.split(',')[i]))
             }
@@ -2387,7 +2388,7 @@ export default {
               reg_type: this.register_type,
               patient_diagnose:str
             }
-            
+
             for (let i = 0; i < this.prescriptions.length; i++) {
               if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
                 this.prescriptions[i]['type'] = 1
@@ -2427,7 +2428,7 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
-          
+
 
                 if(this.prescriptions[i].advices[b].prescribing_number == ""){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量未填写`)
@@ -2800,7 +2801,7 @@ export default {
             this.$message.error('科室不能为空')
             return
           }
-          
+
           var str = ""
           if(patient_diagnose!=""){
              str = this.patient_diagnose.join(',')

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -15,7 +15,7 @@
       <div class='dialysisPage' style="padding-top:40px;">
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -331,6 +331,19 @@
             console.log('所有项目列表', projectlist)
             this.projectList = projectlist
             this.hisPatient = response.data.data.hisPatient
+            this.advicePrint.map((item) => {
+              console.log(item.project.length);
+              if (item.project.length > 0) {
+                for (var i = item.project.length - 1; i >= 0; i--) {
+                  if (item.project[i].type == 2) {
+                    if (item.project[i].project.cost_classify == 3) {
+                      console.log("!1111111")
+                      item.project.splice(i, 1);
+                    }
+                  }
+                }
+              }
+            });
 
           }
         })

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -489,6 +489,7 @@ export default {
               for (var i = item.project.length - 1; i >= 0; i--) {
                 if (item.project[i].type == 2) {
                   if (item.project[i].project.cost_classify == 3) {
+                    console.log("!1111111")
                     item.project.splice(i, 1);
                   }
                 }