Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

         
           <el-table-column align="center" label="住院(门诊)号"  v-if="gatherSetting.admission_number==1">
              <template slot-scope="scope">
-               {{scope.row.xt_receive_treatment_asses.admission_number}}
+               {{scope.row.patient.admission_number}}
              </template>
           </el-table-column>
 
              </template>
           </el-table-column>
   
-          <el-table-column align="center" label="滤过器"  v-if="gatherSetting.dialysis_irrigation ==1">
+          <el-table-column align="center" label="滤过器"  v-if="gatherSetting.dialysis_strainer ==1">
              <template slot-scope="scope">
                <span>{{scope.row.dialysis_prescription.dialysis_strainer}}</span>
              </template>

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

                   <td width="100" v-if="gatherSetting.mode_type==1">透析模式</td>
                   <td width="100" v-if="gatherSetting.dialysis_dialyszers == 1">透析器</td>
                   <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">灌流器</td>
-                  <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">滤过器</td>
+                  <td width="100"  v-if="gatherSetting.dialysis_strainer ==1">滤过器</td>
                   <td width="100"  v-if="gatherSetting.change_nurse ==1">换药包/穿刺针</td>
                   <td width="100" v-if="gatherSetting.anticoagulant==1">抗凝剂(首剂)(维持)(总量)</td>
                   <td width="200" v-if="gatherSetting.tube==1">封管液</td>
                     {{item.patient.dialysis_no}}
                   </td>
                   <td width="100"  v-if="gatherSetting.admission_number==1">
-                    {{item.xt_receive_treatment_asses.admission_number}}
+                    {{item.patient.admission_number}}
                   </td>
                   <td width="100" v-if="gatherSetting.mode_type==1">
                     <span v-if="item.mode_id == 1">HD</span>

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

   import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
   import { getDataConfig } from '@/utils/data'
   import store from "@/store";
+  const moment = require('moment')
   export default {
     components: {
       
         partition_id:0,
         zoneList:[],
         org_id:0,
+       
       }
     },
     open(){
           partion_type:this.partitionType,
           selected_date:this.query.schedule_date,
         }
+    
+        var timeStamp = Date.parse(this.query.schedule_date)
+       
+        var arrDateOne = (timeStamp/1000) -28800
+        console.log("时间搓",arrDateOne) 
+        let dateone =  moment().format('YYYY-MM-DD')//获取标准时间 //Tue Aug 16 2022 15:06:24 GMT+0800 (中国标准时间)
+        //方式一
+        let timeStampOne = Date.parse(dateone)
+        
+        var arrDateTwo = (timeStampOne/1000)-28800
+
+        console.log("时间搓2222",arrDateTwo)
+     
         getDialysisParameterGoodList(params).then(response=>{
            if(response.data.state == 1){
             this.startdialogVisible = true
             var list = response.data.data.list
             var anticoagulantList = []
-            if(list!=null && list.length>0){
-              for(let i=0;i<list.length;i++){
-                 list[i].dialysis_dialyszers_arr = []
-                 list[i].dialyzer_perfusion_apparatus_arr = []
-                 list[i].dialysis_irrigation_arr = []
-                 list[i].dialysis_strainer_arr =[]
-                 if(list[i].dialysis_solution.dialysis_dialyszers!=""){
-                   list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
-                 }
-                 if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
-                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
-                 }
-                 if(list[i].dialysis_solution.dialysis_irrigation!=""){
-                   list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
-                 }
-                 if(list[i].dialysis_solution.dialysis_strainer!=""){
-                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
-                 }
+            
+            if(arrDateOne > arrDateTwo){
+              if(list!=null && list.length>0){
+                  for(let i=0;i<list.length;i++){
+                    list[i].dialysis_dialyszers_arr = []
+                    list[i].dialyzer_perfusion_apparatus_arr = []
+                    list[i].dialysis_irrigation_arr = []
+                    list[i].dialysis_strainer_arr =[]
+                    if(list[i].dialysis_solution.dialysis_dialyszers!=""){
+                      list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
+                    }
+                    if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
+                      list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
+                    }
+                    if(list[i].dialysis_solution.dialysis_irrigation!=""){
+                      list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
+                    }
+                    if(list[i].dialysis_solution.dialysis_strainer!=""){
+                        list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                    }
+
+                    
+                    if(list[i].dialysis_solution.anticoagulant == 1){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                    if(list[i].dialysis_solution.anticoagulant == 2){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                    if(list[i].dialysis_solution.anticoagulant == 3){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                    if(list[i].dialysis_solution.anticoagulant == 4){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                    if(list[i].dialysis_solution.anticoagulant == 5){
+                      anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                      if(list[i].dialysis_solution.anticoagulant == 6){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                      if(list[i].dialysis_solution.anticoagulant == 7){
+                      anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                      if(list[i].dialysis_solution.anticoagulant == 8){
+                      anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                    if(list[i].dialysis_solution.anticoagulant == 9){
+                      anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                      if(list[i].dialysis_solution.anticoagulant == 10){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                      if(list[i].dialysis_solution.anticoagulant == 11){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                      if(list[i].dialysis_solution.anticoagulant == 12){
+                        anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                    if(list[i].dialysis_solution.anticoagulant == 13){
+                      anticoagulantList.push(list[i].dialysis_solution)
+                    }
+                  }
+              }
+            }
 
-                
-                 if(list[i].dialysis_solution.anticoagulant == 1){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                 if(list[i].dialysis_solution.anticoagulant == 2){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                if(list[i].dialysis_solution.anticoagulant == 3){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                 if(list[i].dialysis_solution.anticoagulant == 4){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                if(list[i].dialysis_solution.anticoagulant == 5){
-                   anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                  if(list[i].dialysis_solution.anticoagulant == 6){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                  if(list[i].dialysis_solution.anticoagulant == 7){
-                   anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                  if(list[i].dialysis_solution.anticoagulant == 8){
-                   anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                 if(list[i].dialysis_solution.anticoagulant == 9){
-                   anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                  if(list[i].dialysis_solution.anticoagulant == 10){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                  if(list[i].dialysis_solution.anticoagulant == 11){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                  if(list[i].dialysis_solution.anticoagulant == 12){
-                    anticoagulantList.push(list[i].dialysis_solution)
-                 }
-                 if(list[i].dialysis_solution.anticoagulant == 13){
-                   anticoagulantList.push(list[i].dialysis_solution)
-                 }
+            if(arrDateOne <= arrDateTwo){
+            
+
+              if(list!=null && list.length>0){
+                for(let i=0;i<list.length;i++){
+                    list[i].dialysis_dialyszers_arr = []
+                    list[i].dialyzer_perfusion_apparatus_arr = []
+                    list[i].dialysis_irrigation_arr = []
+                    list[i].dialysis_strainer_arr =[]
+                    if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
+                      list[i].dialysis_dialyszers_arr = list[i].dialysis_prescription.dialysis_dialyszers.split(",")
+                    }
+                    if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
+                      list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_prescription.dialyzer_perfusion_apparatus.split(",")
+                    }
+                    if(list[i].dialysis_prescription.dialysis_irrigation!=""){
+                      list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
+                    }
+                    if(list[i].dialysis_prescription.dialysis_strainer!=""){
+                        list[i].dialysis_strainer_arr = list[i].dialysis_prescription.dialysis_strainer.split(",")
+                    }
+
+                    
+                    if(list[i].dialysis_prescription.anticoagulant == 1){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                    if(list[i].dialysis_prescription.anticoagulant == 2){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                    if(list[i].dialysis_prescription.anticoagulant == 3){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                    if(list[i].dialysis_prescription.anticoagulant == 4){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                    if(list[i].dialysis_prescription.anticoagulant == 5){
+                      anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                      if(list[i].dialysis_prescription.anticoagulant == 6){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                      if(list[i].dialysis_prescription.anticoagulant == 7){
+                      anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                      if(list[i].dialysis_prescription.anticoagulant == 8){
+                      anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                    if(list[i].dialysis_prescription.anticoagulant == 9){
+                      anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                      if(list[i].dialysis_prescription.anticoagulant == 10){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                      if(list[i].dialysis_prescription.anticoagulant == 11){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                      if(list[i].dialysis_prescription.anticoagulant == 12){
+                        anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                    if(list[i].dialysis_prescription.anticoagulant == 13){
+                      anticoagulantList.push(list[i].dialysis_prescription)
+                    }
+                  }
               }
             }
+          
             console.log("anticoagulantList",anticoagulantList)
            this.tableList = []
            if(anticoagulantList!=null && anticoagulantList.length > 0){

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td v-if="org_id!=10587 && org_id!=0">
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
                   <span v-else></span>
                 </td>
                 
                 
-                <td v-if="org_id!=10587&& org_id!=0">
+                <td v-if="org_id!=10587&& org_id!=0 && org_id!=10599">
                   {{ item.advice_spc }}
                 </td>
                </tr>

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

                         this.$store.getters.xt_user.template_info.org_id != 10469 &&
                         this.$store.getters.xt_user.template_info.org_id != 10471 &&
                         this.$store.getters.xt_user.template_info.org_id != 10495 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10375">
+                        this.$store.getters.xt_user.template_info.org_id != 10375 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10600">
                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
                           this.$store.getters.xt_user.template_info.template_id != 45 &&
                           this.$store.getters.xt_user.template_info.org_id != 10346 &&
                           this.$store.getters.xt_user.template_info.org_id != 10387 &&
                           this.$store.getters.xt_user.template_info.org_id != 10495 &&
                           this.$store.getters.xt_user.template_info.org_id != 10375 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10551
+                          this.$store.getters.xt_user.template_info.org_id != 10551 &&
+                          this.$store.getters.xt_user.template_info.org_id != 10600
                            ">
                             <el-form-item
                                     v-if='dialysisPrescription.anticoagulant != 1 &&
                                     this.$store.getters.xt_user.template_info.org_id == 10387 ||
                                     this.$store.getters.xt_user.template_info.org_id ==10495 ||
                                     this.$store.getters.xt_user.template_info.org_id ==10375 ||
-                                    this.$store.getters.xt_user.template_info.org_id ==10551
+                                    this.$store.getters.xt_user.template_info.org_id ==10551 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10600
                                     '
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 &&
                                             this.$store.getters.xt_user.template_info.org_id != 9990 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10495 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10375 &&
-                                            this.$store.getters.xt_user.template_info.org_id != 10551" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                            this.$store.getters.xt_user.template_info.org_id != 10551 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10600" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           this.$store.getters.xt_user.template_info.org_id == 9990 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10495 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10375 ||
-                                          this.$store.getters.xt_user.template_info.org_id == 10551
+                                          this.$store.getters.xt_user.template_info.org_id == 10551 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10600
                                           " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 '
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 || this.$store.getters.xt_user.template_info.org_id == 10600 '
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
       },
 
       handleCommit (formName) {
-         if(this.dialysisPrescription.target_ultrafiltration==0){
+        if(this.$store.getters.xt_user.template_info.org_id ==10579 ){
+          if(this.dialysisPrescription.target_ultrafiltration==0){
              this.$message.error("目标超滤量不能为空")
              return false
          }
+        }
+         
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
         if(this.dialysisPrescription.anticoagulant == "" || this.dialysisPrescription.anticoagulant == 0){
           this.dialysisPrescription.anticoagulant = 3
         }
-        if(this.dialysisPrescription.target_ultrafiltration == 0){
-           this.$message.error("目标超滤量不能为空!")
-           return false
+        if(this.$store.getters.xt_user.template_info.org_id ==10579 ){
+          if(this.dialysisPrescription.target_ultrafiltration==0){
+             this.$message.error("目标超滤量不能为空")
+             return false
+         }
         }
         this.$refs[formName].validate((valid)=>{
           if(valid){

src/xt_pages/user/components/PatientSidebar.1.vue

         fetchAllList().then(response => {
           if (response.data.state == 1) {
             this.patientsList = response.data.data.patients
+            console.log("哈哈哈哈哈",this.patientsList)
             var len = this.patientsList.length
             if (len > 0) {
               for (let index = 0; index < len; index++) {

src/xt_pages/user/components/PatientSidebar.vue

       keyword: '',
       value: '',
       treeKey: '',
+      org_id:0,
       treeData: [
         {
           name: '1',
     getList() {
       fetchAllList().then(response => {
         if (response.data.state == 1) {
-          this.patientsList = response.data.data.patients
+          if(this.org_id ==10191){
+             var patients = response.data.data.patients
+             for(let i=0;i<patients.length;i++){
+               this.patientsList.push(patients[i])
+             }
+          }else{
+            this.patientsList = response.data.data.patients
+            console.log("哈哈哈哈哈哈",this.patientsList)
+          }
+        
+
           var len = this.patientsList.length
           if (len > 0) {
             for (let index = 0; index < len; index++) {
   },
   created() {
     var patientKey =  window.sessionStorage.getItem('patientKey')
-
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
     console.log("patient",patientKey)
     var query = this.$route.path
     console.log("query",this.$route.path)

src/xt_pages/user/doctorAdvice.vue

           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
-                {{ scope.row.advice_name}}<i class="el-icon-arrow-down el-icon--right"></i>
+                <span v-if="scope.row.frequency_type >0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==0"> {{ scope.row.advice_name}}</span>
+                <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
 
               <el-dropdown-menu slot="dropdown">

src/xt_pages/workforce/remind_print_setting.vue

                 <!-- 透析器灌流器 -->
                
                  <div>
-                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445 || org_id == 0">/滤过器</span>:</span>
+                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445 || org_id == 0 || org_id == 10600">/滤过器</span>:</span>
                   <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
                
                 </div>
                 
                
-                <div v-if="org_id!=10440">打印时间:
+                <div v-if="org_id!=10440 && org_id!=10600">打印时间:
                      {{getTime(main_collection.schedule_date)}}   
                      <span v-if="main_collection.schedule_week ==1">星期一</span>
                      <span v-if="main_collection.schedule_week ==2">星期二</span>