518合并代码

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -1021,6 +1021,7 @@
               this.showAdviceForm = false
               this.showAdvicePanel = true
               var advice = response.data.data.advice
+              console.log("advic323323232323232",advice)
               this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec
               this.doctor_advices[this.currentIndex].drug_spec_unit =
                 advice.drug_spec_unit
@@ -1382,7 +1383,7 @@
           return false
         }
         let mode = '1'
-
+       console.log("sry2332322332",this.src_type)
        if(this.src_type == ""){
           this.form.way = 1
        }
@@ -1409,6 +1410,9 @@
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
+              console.log("子药23223332323332",this.form.parent_id)
+              console.log("232322332323232",this.form.parent_id)
+           
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
                 for (let index = this.doctor_advices.length - 1; ; index--) {
@@ -1420,6 +1424,7 @@
                     break
                   }
                 }
+                console.log("spliceIndex233232323232",spliceIndex)
                 if (spliceIndex > -1) {
                   spliceIndex += 1
                   if (spliceIndex === this.doctor_advices.length) {
@@ -1431,18 +1436,19 @@
                       this.doctor_advices.push(swapData[index])
                     }
                   }
+                 
+                  console.log("doctore_advic4233232323232",this.doctor_advices)
                 }
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
               }
               return false
             }
-          })
-          .catch(v => {
+          }).catch(v => {
             this.loading = false
           })
         // location. reload()
-        this.getDialysisScheduleDetail()
+       // this.getDialysisScheduleDetail()
 
       }
       ,

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -331,7 +331,7 @@ export default {
             dataInfo[item_id].child.push(item)
           })
           let arr = Object.values(dataInfo) 
-          
+          console.log("中欧地区3323323223322332322323323232",arr)
           for(let i=0;i<arr.length;i++){
             for(let j=0;j<arr[i].child.length;j++){
                if(arr[i].advice_id >0){

src/xt_pages/outpatientTool/detailPrint.vue

@@ -11,22 +11,22 @@
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
         <div>结算类别：
-          {{ getType(his_patient.balance_accounts_type) }}
+          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
           {{getType(his_record_patient.balance_accounts_type)}}
         </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
       </div>
       <div class="listInfo">
         <div>住院/门诊号：
-          {{his_patient.number}}
+          <!-- {{his_patient.number}} -->
           {{his_record_patient.ipt_otp_no}}
         </div>
         <div>科室：
-          {{ getDepartment(his_patient.departments) }}
+          <!-- {{ getDepartment(his_patient.departments) }} -->
           {{ getDepartment(his_record_patient.departments) }}
         </div>
         <div style="min-width:350px;">就诊流水号：
-          {{ his_patient.number }}
+          <!-- {{ his_patient.number }} -->
           {{his_record_patient.number}}
         </div>
       </div>

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -9,11 +9,13 @@
             <div>医疗机构名称：{{$store.getters.xt_user.org.org_name}}</div>
         </div>
         <div class="listInfo">
-            <div>科别：{{getDepartment(his_patient.departments)}}
+            <div>科别：
+              <!-- {{getDepartment(his_patient.departments)}} -->
               {{getDepartment(his_record_patient.departments)}}
             </div>
             <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
-            <div>门诊号：{{his_patient.number}}
+            <div>门诊号：
+               <!-- {{his_patient.number}} -->
                {{his_record_patient.ipt_otp_no}}
             </div>
             <div>姓名：{{patient.name}}</div>

src/xt_pages/outpatientTool/gatherPrintInvoice.vue

@@ -15,8 +15,10 @@
         <table class="listTable" table border rules=none cellspacing=0 align=center>
             <tr>
                 <td>姓名：{{patient.name}}</td>
-                <td>科室：{{getDepartment(his_patient.departments)}}
-                         {{ getDepartment(his_record_patient.departments) }}
+                <td>科室：
+                    <!-- {{getDepartment(his_patient.departments)}} -->
+
+                   {{ getDepartment(his_record_patient.departments) }}
                 </td>
                 <td></td>
             </tr>