新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                 {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510">
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_number.number }}
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px">
+            <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460">
               住院号/门诊号：
               <div
                 class="under_line"
                 {{ item.name }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
+            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
               诊断：
               <div
                 class="under_line"
                   {{ "/" }}
                 </div>
               </div>
-              <div class="inline_block">
+              <div class="inline_block" v-if="org_id!=10460">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
                   {{ "/" }}
                   {{ record.patient.dialysis_no }}
                 </div>
               </div>
-              <div class="inline_block" style="margin-left: 5px">
+              <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460">
                 住院号/门诊号：
                 <div
                   class="under_line"
                   {{ item.name }}
                 </div>
               </div>
-              <div class="inline_block" style="margin-left: 10px">
+              <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
                 诊断：
                 <div
                   class="under_line"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

               <span v-else>{{ "/" }}</span>
             </div>
           </div>
-          <div class="inline_block">
+          <div class="inline_block" v-if="org_id!=10460">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
               <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447">
+          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447&&org_id!=10460">
             住院号/门诊号：
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
               {{ receiverTreatmentAccess.admission_number }}
             <!--</div>-->
           </div>
 
-          <div class="inline_block" style="margin-left: 10px">
+          <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
             诊断：
             <div
               class="under_line"
               <span v-else>{{ "/" }}</span>
             </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510" >
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460" >
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
               <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460">{{
               </div>
             </div>
             <div class="inline_block" style="margin-left: 5px"
-            v-if="org_id!=9675 && org_id!=10447">
+            v-if="org_id!=9675 && org_id!=10447 && org_id!=10460">
             住院号/门诊号：
             <div
               class="under_line"
               <!--平车-->
               <!--</div>-->
             </div>
-            <div class="inline_block" style="margin-left: 10px">
+            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
               诊断：
               <div
                 class="under_line"
                     </div>
                   </div>
                   <div
+                    v-if="org_id!=10460"
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

     }
   },
   methods: {
+    unique(arr) { // 根据唯一标识id来对数组进行过滤
+      const res = new Map();//定义常量 res,值为一个Map对象实例
+      //返回arr数组过滤后的结果，结果为一个数组   过滤条件是，如果res中没有某个键，就设置这个键的值为1
+      return arr.filter((arr) => !res.has(arr.advice_name) && res.set(arr.advice_name, 1))
+    },
     getDialysisRecord() {
       this.loading = true;
       this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+      
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
              if(this.projects[i].type== 2){
-              this.projects[i].advice_name = this.projects[i].project.project_name
-              this.projects[i].start_time = this.projects[i].start_time
-              this.projects[i].single_dose = this.projects[i].single_dose
-              this.projects[i].single_dose_unit = this.projects[i].unit
-              this.projects[i].execution_time = this.projects[i].execution_time
-              this.projects[i].execution_staff= this.projects[i].execution_staff 
-              this.advices.push(this.projects[i])
+            
+              this.projects[i].project_team_name = ""
+              this.projects[i].project_team_id = 0
+              console.log("this.projects[i].project.team",this.projects[i].project.team)
+              if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+                this.projects[i].project_team = this.projects[i].team.project_team
+                this.projects[i].project_team_id = this.projects[i].team.id
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].advice_name =  this.projects[i].team.project_team
+              
+               
+                this.advices.push(this.projects[i])
+              }else{
+                this.projects[i].project_team = this.projects[i].project.project_name
+                this.projects[i].advice_name = this.projects[i].project.project_name
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.advices.push(this.projects[i])
+              }
+             
              }
              
            }
         }
-        
-
+       
+       
+      
         var tableAdvice = this.advices;
 
 
           this.advices = tableAdvice;
         }
 
+        var arr = [] 
+        arr = this.unique(this.advices)
+        this.advices = []
+        this.advices= arr
+        console.log("wowoowowowo",arr)
         console.log("advices-----------------",this.advices)
 
  

src/xt_pages/user/Sitemap.vue

               }
              }
 
-             this.fileList[0].img_url =  sitemap.img_url
+            
             }
 
          }