1

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -185,7 +185,7 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
+            this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
             console.log("争端",this.diagnoses)
           }
        })
@@ -256,17 +256,16 @@ export default {
           return a-b;
         })
         
-        let diagnoses = this.diagnoses.sort(this.compare('id'))
         var name = ""
         let nameArr = []
-        for(let i=0;i<diagnoses.length;i++){
+        for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
           
-          if(newIds.indexOf(diagnoses[i].id.toString()) > -1){
+          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
-            nameArr.push(diagnoses[i].class_name)
+            nameArr.push(this.diagnoses[i].class_name)
           }
         }
         let newNameArr = []

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -10,7 +10,7 @@
             <span v-if="item.med_type == '1112'" style="margin-left: 50px;border: 1px solid #000;">精二</span>
           </div>
           <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line"><span v-if="faber && faber.transBody">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></span></div>
             <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber && faber.transBody ? faber.transBody.aac999 : ''  }}</span></div>
             <div style="width:33%;display:flex;">处方编号：<span class="under_line">{{ item.prescription_number.substring(item.prescription_number.length-6) }}</span></div>
           </div>
@@ -25,9 +25,9 @@
               <div>年龄：{{item.patient.age?item.patient.age:""}}岁</div>
           </div>
           <div class="infoMain">
-              <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line">{{hisPatient.number?hisPatient.number:""}}</span></div>
-              <div style="margin-bottom: 10px;display:flex;">科别：<span class="under_line">{{item.info?getDepart(item.info.departments):''}}</span></div>
-              <div style="margin-bottom: 10px;display:flex;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+              <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line" v-if="hisPatient.number">{{hisPatient.number?hisPatient.number:""}}</span></div>
+              <div style="margin-bottom: 10px;display:flex;">科别：<span class="under_line" v-if="item.info">{{item.info?getDepart(item.info.departments):''}}</span></div>
+              <div style="margin-bottom: 10px;display:flex;">临床诊断：{{ item.info.diagnosis ? getDiagnosis(item.info.diagnosis) : ''}}</div>
               <div style="margin-bottom: 10px;display:flex;">自费药品签名：<span class="under_line"></span></div>
               <!-- <div style="margin-bottom: 10px;display:flex;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div> -->
               <div style="margin-bottom: 10px;display:flex;">联系方式：<span class="under_line">{{item.patient.phone}}</span></div>
@@ -162,6 +162,7 @@ export default {
             var advicePrint =  response.data.data.advicePrint
             console.log("adviceprint9999",advicePrint)
             this.advicePrint = advicePrint
+            this.getPage()
             this.prescriptions = advicePrint
             console.log("处方222222",this.prescriptions)
             var hisPatient = response.data.data.hisPatient
@@ -170,7 +171,7 @@ export default {
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
             this.projectList = projectlist
-            this.getPage()
+            
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
             this.faber = outputlist1Name
 
@@ -194,7 +195,7 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
+            this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
             console.log("争端",this.diagnoses)
           }
        })
@@ -209,7 +210,7 @@ export default {
        return name
      },
     getTotalOne(id) {
-
+        console.log('id',id)
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -264,18 +265,16 @@ export default {
         let newIds = ids.split(',').sort(function(a,b){
           return a-b;
         })
-        
-        let diagnoses = this.diagnoses.sort(this.compare('id'))
         var name = ""
         let nameArr = []
-        for(let i=0;i<diagnoses.length;i++){
+        for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
           
-          if(newIds.indexOf(diagnoses[i].id.toString()) > -1){
+          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
-            nameArr.push(diagnoses[i].class_name)
+            nameArr.push(this.diagnoses[i].class_name)
           }
         }
         let newNameArr = []
@@ -396,9 +395,10 @@ export default {
 
    },
    created(){
+      this.getPrescriptionPrint()
       this.getAllDoctorList()
       this.getInitData()
-      this.getPrescriptionPrint()
+      
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
@@ -406,6 +406,7 @@ export default {
    },
    watch:{
      ids:function(val){
+       console.log('val1111111111111111111111111111',val)
       this.ids = val
       this.getPrescriptionPrint()
     }

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -389,7 +389,7 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
+            this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
             console.log("争端",this.diagnoses)
           }
        })
@@ -399,17 +399,16 @@ export default {
           return a-b;
         })
         
-        let diagnoses = this.diagnoses.sort(this.compare('id'))
         var name = ""
         let nameArr = []
-        for(let i=0;i<diagnoses.length;i++){
+        for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
           
-          if(newIds.indexOf(diagnoses[i].id.toString()) > -1){
+          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
-            nameArr.push(diagnoses[i].class_name)
+            nameArr.push(this.diagnoses[i].class_name)
           }
         }
         let newNameArr = []
@@ -430,7 +429,7 @@ export default {
         }
       },
      getName(list) {
-        console.log('list',list)
+        console.log('list22',list)
         let new_list = []
         for (let i = 0; i < list.length; i++) {
           if (list[i].aac031 == '1') {