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

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

       </div>
       <div class="cell clearfix" style="justify-content: space-between;">
         <label class="title"><span class="name">分区</span> : </label>
-        <el-select v-model="partition_id" multiple  placeholder="请选择分区" style="margin-left:-400px"  @change="selectPartitionType">
+        <el-select v-model="partition_id" multiple  placeholder="请选择分区" style="margin-left:-800px"  @change="selectPartitionType">
           <el-option
             v-for="item in partitionArrOne"
             :key="item.id"
               <span v-if="scope.row.mode_id == 35">HDF600</span>
               <span v-if="scope.row.mode_id == 36">HDF800</span>
               <span v-if="scope.row.mode_id == 37">HDF1000</span>
+              <span v-if="scope.row.mode_id == 38">HDF80</span>
+              <span v-if="scope.row.mode_id == 39">HF16</span>
+              <span v-if="scope.row.mode_id == 40">HD(无肝素)</span>
+              <span v-if="scope.row.mode_id == 41">HDF17H</span>
+              <span v-if="scope.row.mode_id == 42">HD.</span>
+              <span v-if="scope.row.mode_id == 43">HD(2)</span>
              </template>
           </el-table-column>
              
                 <span v-if="scope.row.dialysis_prescription.dialysis_dialyszers==''">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span> 
                </span>
 
-               <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
+               <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span>
 
                <span v-if="scope.row.schedule_date > timenow">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
              </template>
                   {{scope.row.dialysis_solution.dialysis_irrigation}}
                  </span> 
                </span>
-               <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
+               <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_prescription.dialysis_irrigation}}</span>
                <span v-if="scope.row.schedule_date > timenow">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
 
              </template>
                   {{ scope.row.dialysis_solution.dialysis_strainer }}
                 </span>
                </span>
-               <span v-if="scope.row.schedule_date<timenow">{{ scope.row.dialysis_solution.dialysis_strainer }}</span>
+               <span v-if="scope.row.schedule_date<timenow">{{ scope.row.dialysis_prescription.dialysis_strainer }}</span>
                <span v-if="scope.row.schedule_date>timenow">{{ scope.row.dialysis_solution.dialysis_strainer }}</span>
              </template>
           </el-table-column>
   
           <el-table-column align="center" label="促红素" v-if="gatherSetting.cuhong == 1">
              <template slot-scope="scope">
-                {{ scope.row.advice_spc }}
+               <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc }}</span>
+               <span v-if="scope.row.schedule_date > timenow"> {{ getLongAdvice(scope.row.long_doctor_advice,scope.row.schedule_date) }} </span>
              </template>
           </el-table-column>
 
           <el-table-column align="center" label="左卡" v-if="gatherSetting.zuoka == 1">
              <template slot-scope="scope">
-                {{ scope.row.advice_spc_one }}
+                <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_one }}</span>
+                <span v-if="scope.row.schedule_date > timenow"> {{ getLongAdviceOne(scope.row.long_doctor_advice,scope.row.schedule_date) }} </span>
              </template>
           </el-table-column>
 
           <el-table-column align="center" label="尿激酶" v-if="gatherSetting.niaojimei == 1">
              <template slot-scope="scope">
-                {{ scope.row.advice_spc_two }}
+               <span v-if="scope.row.schedule_date <= timenow">{{ scope.row.advice_spc_two }}</span>
+               <span v-if="scope.row.schedule_date > timenow"> {{ getLongAdviceTwo(scope.row.long_doctor_advice,scope.row.schedule_date) }} </span>
              </template>
           </el-table-column>
 
 
           <el-table-column align="center" label="葡萄糖酸钙" v-if="gatherSetting.putaosuangai == 1">
              <template slot-scope="scope">
-                {{ scope.row.advice_spc_three }}
+              <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_three }}</span>
+              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceThree(scope.row.long_doctor_advice,scope.row.schedule_date) }}</span>
+             </template>
+          </el-table-column>
+
+          <el-table-column align="center" label="肝素钠" v-if="org_id == 0 || org_id == 10683">
+             <template slot-scope="scope">
+              <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_four }}</span>
+              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceFour(scope.row.long_doctor_advice,scope.row.schedule_date)  }}</span>
              </template>
           </el-table-column>
-        
-  
           
         </el-table>
   
           gatherSetting:{},
           timenow:0,
           startDialogVisibleOne:false,
+          org_id:0,
         }
       },
       open(){
         console.log("寄哪里地方到付阿道夫")
       },
       created() {
+         this.org_id = this.$store.getters.xt_user.org.id
          this.blood_access_option  = getDataConfig('hemodialysis', 'vascular_access_desc')
          this.displace_liqui_part_option = this.$store.getters.displace_liqui
       
                   list[i].advice_spc_one =""
                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
-                   for(let j=0;j<list[i].advice.length;j++){
+                  list[i].advice_spc_four = ""
+                  for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
                        }
                           list[i].advice_spc_three+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
                        }
 
+                       if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
+                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                       }
+
                    }
                 }
                 console.log("listwowowowowowo日本",this.list)
            if(id ==37){
              mode_name ="HDF1000"
            }
+
+           if(id ==38){
+             mode_name ="HDF80"
+           }
+
+           if(id ==39){
+             mode_name ="HF16"
+           }
+
+           if(id ==40){
+             mode_name ="HD(无肝素)"
+           }
+
+           if(id ==41){
+             mode_name ="HDF17H"
+           }
+
+           if(id ==42){
+             mode_name ="HD."
+           }
+
+           if(id ==43){
+             mode_name ="HD(2)"
+           }
           
            return mode_name
         },
            if(id == 7){
              name ="低分子肝素钠"
            }
+           if(id == 8){
+             name ="依诺肝素"
+           }
+           if(id == 9){
+             name ="达肝素"
+           }
+           if(id == 10){
+             name ="体外抗凝"
+           }
+           if(id == 11){
+             name ="那屈肝素"
+           }
+           if(id == 12){
+             name ="无抗凝剂"
+           }
+           if(id == 13){
+             name ="那屈肝素钙"
+           }
+           if(id == 14){
+             name ="肝素钙注射液"
+           }
+           if(id == 15){
+             name ="甲磺酸萘莫司他"
+           }
+           if(id == 16){
+             name ="低分子量肝素钙"
+           }
+           if(id == 17){
+             name ="肝素钠"
+           }
+
+           if(id == 18){
+             name ="贝米肝素钠注射液"
+           }
+           
            return name
         },
         handleScheduleDateChange(val) {
          if(id == 13){
            name ="那屈肝素钙"
          }
+         if(id == 14){
+           name ="肝素钙注射液"
+         }
+         if(id == 15){
+           name ="甲磺酸萘莫司他"
+         }
+         if(id == 16){
+           name ="低分子量肝素钙"
+         }
+         if(id == 17){
+           name ="肝素钠"
+         }
+         if(id == 18){
+           name ="贝米肝素钠注射液"
+         }
+
          return name
        },
        getBloodAccessOption(id){
        toStatic(){
         
         this.startDialogVisibleOne = true
-       }
+       },
+       getLongAdvice(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("促红")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+         
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2 && newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getLongAdviceOne(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("左卡")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2 && newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+
+       getLongAdviceTwo(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("尿激酶")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2 && newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getLongAdviceThree(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("葡萄糖酸钙")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2 && newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+            advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getLongAdviceFour(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("肝素钠")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2 && newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getweekday(date){
+          var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+          var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+         return week;
+      },
       }
     }
   </script>

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

                 <thead>
                 <tr>
                   <td width="60" v-if="gatherSetting.index_number == 1">序号</td>
+                  <td width="200" v-if="org_id == 0 || org_id ==10683">备注</td>
                   <td width="100"  v-if="gatherSetting.name==1">姓名</td>
                   <td width="100"  v-if="gatherSetting.dialysis_no==1">透析号</td>
                   <td width="100"  v-if="gatherSetting.admission_number==1">住院(门诊)号</td>
                   <td width="100"  v-if="gatherSetting.zuoka == 1">左卡</td>
                   <td width="100" v-if="gatherSetting.niaojimei == 1">尿激酶</td>
                   <td width="100" v-if="gatherSetting.putaosuangai == 1">葡萄糖酸钙</td>
+
+                  <td width="100" v-if="org_id == 0 || org_id ==10683">肝素钠</td>
                  
                 </tr>
                 </thead>
                 <tbody>
                  <tr v-for="(item,i) in list" :key="i">
+                  <td width="100" v-if="org_id == 0 || org_id ==10683"> </td>
                    <td width="60" v-if="gatherSetting.index_number == 1">{{ i+1 }}</td>
                   <td width="100"  v-if="gatherSetting.name==1">
                     {{item.patient.name}}
                     <span v-if="item.mode_id == 33">HFD</span>
                     <span v-if="item.mode_id == 34">HDF100</span>
                     <span v-if="item.mode_id == 35">HDF600</span>
-                    <span v-if="item.mode_id == 35">HDF800</span>
-                    <span v-if="item.mode_id == 35">HDF1000</span>
+                    <span v-if="item.mode_id == 36">HDF800</span>
+                    <span v-if="item.mode_id == 37">HDF1000</span>
+                    <span v-if="item.mode_id == 38">HDF80</span>
+                    <span v-if="item.mode_id == 39">HF16</span>
+                    <span v-if="item.mode_id == 40">HD(无肝素)</span>
+                    <span v-if="item.mode_id == 41">HDF17H</span>
+                    <span v-if="item.mode_id == 42">HD.</span>
+                    <span v-if="item.mode_id == 43">HD(2)</span>
                  </td>
                   <td width="100" v-if="gatherSetting.dialysis_dialyszers == 1">
                     <span v-if="item.schedule_date == timenow">
                       <span v-if="item.dialysis_prescription.dialysis_dialyszers!=''">{{item.dialysis_prescription.dialysis_dialyszers}}</span> 
                       <span v-if="item.dialysis_prescription.dialysis_dialyszers==''">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
                      </span> 
-                    <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
+                    <span v-if="item.schedule_date < timenow">{{item.dialysis_prescription.dialysis_dialyszers}}</span> 
                     <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
                   </td>
                   <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">
                       <span v-if="item.dialysis_prescription.dialysis_irrigation==''"> {{item.dialysis_solution.dialysis_irrigation}}</span>
                     </span>
 
-                    <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_irrigation}}</span>
+                    <span v-if="item.schedule_date < timenow">{{item.dialysis_prescription.dialysis_irrigation}}</span>
 
                     <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_irrigation}}</span>
                   </td>
                       <span v-if="item.dialysis_prescription.dialysis_strainer==''">{{item.dialysis_solution.dialysis_strainer}}</span> 
                     </span>
 
-                    <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_strainer}}</span>
+                    <span v-if="item.schedule_date < timenow">{{item.dialysis_prescription.dialysis_strainer}}</span>
 
                     <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_strainer}}</span>
                   </td>
                     <span v-if="item.dialysis_prescription.calcium>0">{{item.dialysis_prescription.calcium}}</span>
                  </td>
                   <td width="100" v-if="gatherSetting.cuhong == 1">
-                    {{ item.advice_spc }}
+                     <span v-if="item.schedule_date <= timenow">{{ item.advice_spc }}</span>   
+                     <span v-if="item.schedule_date > timenow">{{ getLongAdvice(item.long_doctor_advice,item.schedule_date)  }}</span>   
                  </td>
                   <td width="100"  v-if="gatherSetting.zuoka == 1">
-                    {{ item.advice_spc_one }}
+                    <span  v-if="item.schedule_date <= timenow">{{ item.advice_spc_one }}</span>  
+                    <span v-if="item.schedule_date>timenow">{{  getLongAdviceOne(item.long_doctor_advice,item.schedule_date) }}</span>
                  </td>
                   <td width="100" v-if="gatherSetting.niaojimei == 1">
-                    {{ item.advice_spc_two }}
+                    <span v-if="item.schedule_date<=timenow"> {{ item.advice_spc_two }}</span>
+                    <span v-if="item.schedule_date > timenow"> {{getLongAdviceTwo(item.long_doctor_advice,item.schedule_date)}}</span>
                  </td>
                   <td width="100" v-if="gatherSetting.putaosuangai == 1">
-                    {{ item.advice_spc_three }}
+                    <span v-if="item.schedule_date<=timenow">  {{ item.advice_spc_three }}</span>
+                    <span v-if="item.schedule_date>timenow">{{ getLongAdviceThree(item.long_doctor_advice,item.schedule_date) }}</span>
+                 </td>
+                 <td width="100" v-if="org_id == 0 || org_id ==10683">
+                  <span v-if="item.schedule_date<=timenow">  {{ item.advice_spc_four }}</span>
+                  <span v-if="item.schedule_date>timenow">{{ getLongAdviceFour(item.long_doctor_advice,item.schedule_date) }}</span>
                  </td>
-                 
                  </tr>
                 </tbody>
               </table>
                   list[i].advice_spc_one =""
                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
+                   list[i].advice_spc_four = ""
                    for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
                           list[i].advice_spc_three+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
                        }
 
+                       if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
+                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                       }
+
                    }
                 }
               this.list = list
          if(id == 13){
            name ="那屈肝素钙"
          }
+         if(id == 14){
+           name ="肝素钙注射液"
+         }
+         if(id == 15){
+           name ="甲磺酸萘莫司他"
+         }
+         if(id == 16){
+           name ="低分子量肝素钙"
+         }
+         if(id == 17){
+           name ="肝素钠"
+         }
+         if(id == 18){
+           name ="贝米肝素钠注射液"
+         }
          return name
        },
        getBloodAccessOption(id){
             return a - b; //升序
           }
         },
+
+        getLongAdvice(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("促红")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+         
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2&& newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getLongAdviceOne(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("左卡")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2&& newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+
+       getLongAdviceTwo(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("尿激酶")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2&& newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getLongAdviceThree(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("葡萄糖酸钙")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2&& newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getLongAdviceFour(val,schedule_date){
+        var newArrList = []
+        var newArr = []
+        var advice_name = ""
+         if(val!=null && val.length>0){
+            for(let i=0;i<val.length;i++){
+              if(val[i].advice_name.indexOf("肝素钠")!=-1){
+                newArrList.push(val[i])
+              }
+            }
+         }
+        
+         if(newArrList!=null && newArrList.length>0){
+           for(let i=0;i<newArrList.length;i++){
+             if(newArrList[i].frequency_type == 1 || (newArrList[i].frequency_type == 2&& newArrList[i].day_count == 1) || (newArrList[i].frequency_type == 3 && newArrList[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+                  
+                  newArr.push(newArrList[i])
+             }
+           }
+         }
+       
+         if(newArr!=null && newArr.length>0){
+           for(let i=0;i<newArr.length;i++){
+              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+           }
+         }
+         return advice_name
+       },
+       getweekday(date){
+          var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+          var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+         return week;
+      },
       
       }
     }

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

             <span v-if="scope.row.mode_id == 35">HDF600</span>
             <span v-if="scope.row.mode_id == 36">HDF800</span>
             <span v-if="scope.row.mode_id == 37">HDF1000</span>
+            <span v-if="scope.row.mode_id == 38">HDF80</span>
+            <span v-if="scope.row.mode_id == 39">HF16</span>
+            <span v-if="scope.row.mode_id == 40">HD(无肝素)</span>
+            <span v-if="scope.row.mode_id == 41">HDF17H</span>
+            <span v-if="scope.row.mode_id == 42">HD.</span>
+            <span v-if="scope.row.mode_id == 43">HD(2)</span>
            </template>
         </el-table-column>
         <el-table-column align="center" label="透析号" v-if="dialysisSett.dialysis_no==1">

src/xt_pages/qcd/patientControlAnalysis.vue

                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             <el-table-column fixed prop="name" label="姓名" width="100"></el-table-column>
+            <el-table-column label="检验日期" width="100">
+              <template slot-scope="scope">
+                {{getTime(scope.row.inspect_date)}}
+              </template>
+            </el-table-column>
             <el-table-column label="透析号" width="80">
               <template slot-scope="scope">
                 {{ scope.row.dialysis_no }}
 import echarts from 'echarts'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import LineChart from '../qcd/components/LineChart'
+import { uParseTime } from '@/utils/tools'
 import {
   getCartogramlist,
   getCurrentOrgPatients,
   },
   data() {
     return {
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
       pickerOptions: {
         disabledDate(time) {
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
           this.isLoadingTwo = false
 
           var control = response.data.data.patientcontorDetail
-          console.log("control",control)
+          
           let dataInfo = {}
           control.forEach((item, index) => {
             let { inspect_date } = item
                 child: [],
                 patient_id: item.patient_id,
                 range_type: item.range_type,
-                dialysis_no: item.dialysis_no
+                dialysis_no: item.dialysis_no,
+                inspect_date:item.inspect_date
               }
             }
           })
               }
             })
           })
+
+          console.log("tableData============================",this.tableData)
           //   let projectArr = []
           //   this.newArr.map(item => {
           //     projectArr.push(item.item_name)
           })
 
 
-          //  var newPatinteArr = []
-          //  patientlist.map(item=>{
-          //    for(let i=0;i<control.length;i++){
-          //       if(item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id){
-          //            item.child.push(control[i])
-          //       }
-          //    }
-          //  })
-          //  console.log("patientlist",patientlist)
-
           var newArr = []
           // 分页
           for (let i = 0; i < control.length; i++) {
                 name: item.name,
                 child: [],
                 patient_id: item.patient_id,
-                range_type: item.range_type
+                range_type: item.range_type,
+                inspect_date:item.inspect_date
               }
             }
           })
             })
           })
 
-          console.log("list")
-          console.log(list)
-          console.log(newarrtwo)
+       
 
 
           // 配置的才显示
                 name: item.name,
                 inspect_value: item.inspect_value,
                 id: item.id,
+                inspect_date:item.inspect_date,
               }
             }
           })
                   item_name: this.ObjectData[mkey].item_name,
                   name: mkey,
                   inspect_value: 0,
-                  range_type: this.ObjectData[mkey].range_type
+                  range_type: this.ObjectData[mkey].range_type,
+                  inspect_date:this.ObjectData[mkey].inspect_date
                 }
               }
             }
+
+            console.log("haaaaaaaaaaaaa",this.tableData)
             this.tableData.push({ name: key, data: dd[key] })
           }
 
     toExportList(){
       import("@/vendor/Export2Excel").then((excel) => {
        
-         var arr =["序号","姓名","透析号"]
+         var arr =["序号","检验日期","姓名","透析号"]
           if(this.normData!=null && this.normData.length>0){
             for(let i=0;i<this.normData.length;i++){
                arr.push(this.normData[i].item_name)
           for(let i=0;i<this.tableData.length;i++){
             var obj = {index:0,name:"",patient_id:0,dialysis_no:"",item_name:""}
             for(let j=0;j<this.normData.length;j++){
+              obj.inspect_date_str = this.getTime(this.tableData[i].inspect_date)
                obj.index = i+1
                obj.patient_id = this.tableData[i].patient_id
                obj.name = this.tableData[i].name
          }
         console.log("患者质控达标统计",newArr) 
         const tHeader = arr
-         var newList = ["index","name","dialysis_no"]
+         var newList = ["index","inspect_date_str","name","dialysis_no"]
          if(this.normData!=null && this.normData.length>0){
             for(let i=0;i<this.normData.length;i++){
               newList.push(this.normData[i].item_name)

src/xt_pages/workforce/next_remind_print.vue

                   <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
                   <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
                   <td width="100" >血管通路</td>
+                  <td width="" v-if="org_id == 0 || org_id ==10567">管路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
                 <td :width="td_1_width">
                   <span>{{getBloodName(main_collection.dialysissolution.blood_access)  }}</span>
                 </td>
+                <td v-if="org_id == 0 || org_id ==10567">
+                   <span>
+                     {{ getProjectName(main_collection.projectList,main_collection.schedule_date) }}
+                   </span>
+                </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
           var scheduleData = resp.data.schedule
 
             if(this.pre_status == 0){
-                for(let i=0;i<scheduleData.length;i++){
-                scheduleData[i].sort = scheduleData[i].number.sort
+               for(let i=0;i<scheduleData.length;i++){
+                if(this.org_id == 10567){
+                  
+                  scheduleData[i].projectList = []
+                  if(scheduleData[i].his_prescription_template.his_prescription_info!=null && scheduleData[i].his_prescription_template.his_prescription_info.length>0){
+                    for(let j=0;j<scheduleData[i].his_prescription_template.his_prescription_info.length;j++){
+                      if(scheduleData[i].his_prescription_template.his_prescription_info[j].project!=null && scheduleData[i].his_prescription_template.his_prescription_info[j].project.length >0){
+                        for(let z=0;z<scheduleData[i].his_prescription_template.his_prescription_info[j].project.length;z++){
+                          scheduleData[i].projectList.push(scheduleData[i].his_prescription_template.his_prescription_info[j].project[z])
+                        }
+                        
+                      }
+                    }
+                  }
+                }
+              
+                 scheduleData[i].sort = scheduleData[i].number.sort
               }
               var arr =   scheduleData.sort(this.compare('sort'))
             
 
         return type_name 
 
+      },
+      getProjectName(val,schedule_date){
+       var project_name = ""
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+          if(val[i].good_info.good_type_id == 9716){
+            if(val[i].frequency_type == 1 || (val[i].frequency_type == 3 && val[i].week_day.indexOf(this.getweekday(schedule_date))!=-1)){
+              project_name += val[i].good_info.good_name +val[i].count + val[i].good_info.packing_unit +","
+            }
+          }
+           
+         }
+       }
+       return project_name
+      },
+      getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
       }
     }
   }

src/xt_pages/workforce/remind_print.vue

                   <td width="30" v-if="printObj.anticoagulant_zongliang == 1">维持</td>
                   <td width="30" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
                   <td width="">血管通路</td>
-                  <td width="" v-if="org_id == 0 || org_id ==10567">管路</td>
+                  <td width="" v-if="org_id ==10567">管路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
                 <td >
                    <span>{{getBloodName(main_collection.prescription.blood_access)  }}</span>
                 </td>
-                <td v-if="org_id == 0 || org_id ==10567">
+                <td v-if="org_id ==10567">
                    <span>
                      {{ getProjectName(main_collection.projectList,main_collection.schedule_date) }}
                    </span>
            console.log("list2323323",list)
            for(let i=0;i<list.length;i++){
               list[i].sort = list[i].number.sort
-              list[i].projectList = []
-              if(list[i].his_prescription_template.his_prescription_info.length>0){
-                for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
-                  if(list[i].his_prescription_template.his_prescription_info[j].project.length >0){
-                    for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
-                      list[i].projectList.push(list[i].his_prescription_template.his_prescription_info[j].project[z])
+              if(this.org_id == 10567){
+                list[i].projectList = []
+                if(list[i].his_prescription_template.his_prescription_info!=null && list[i].his_prescription_template.his_prescription_info.length>0){
+                  for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
+                    if(list[i].his_prescription_template.his_prescription_info[j].project!=null && list[i].his_prescription_template.his_prescription_info[j].project.length >0){
+                      for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
+                        list[i].projectList.push(list[i].his_prescription_template.his_prescription_info[j].project[z])
+                      }
+                      
                     }
-                    
                   }
                 }
               }
+             
            }
            console.log("likst==========================",list)
            var arr = list.sort(this.compare('sort'))