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

src/xt_pages/dialysis/details/NavIgation.vue

         return [item.groupno];
       });
 
-
-      // var strLength = 0
-      // var arr = []
-      // if(this.his_doctor_advices!=undefined && this.his_doctor_advices.length > 0){
-      //   for(let i=0;i<this.his_doctor_advices.length;i++){
-      //     if (this.his_doctor_advices[i].execution_state == 2) {
-      //      arr.push(this.his_doctor_advices[i]);
-      //    }
-      //   }
-      //   strLength = arr.length
-      // }
-      // console.log("232332323232323223",arrOne.length + strLength);
       return sorted.length
 
     },

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

           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
-            <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
+            <span v-if="org_id !=10599">
+              {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
+            </span>
+            <span v-if="org_id==10599">
+              <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
+              <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
+            </span>
+          
             <!-- {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}} -->
           </template>
 

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

                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in rowList" :key="index">
                   <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
-                  <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
-                  <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
+                  <span v-if="org_id !=10599">
+                    {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}
+                  </span>
+                  <span v-if="org_id==10599">
+                    <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
+                     <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
+                  </span>
+                
                 </td>
                </tr>
               </tbody>

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

            }
             this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
             this.assessmentBeforeDislysis.blood_access_part_id = this.lastAssessment.blood_access_part_id
+            
+            if(this.$store.getters.xt_user.template_info.org_id == 10375  || this.$store.getters.xt_user.template_info.org_id == 10571  || this.$store.getters.xt_user.template_info.org_id == 0){
+              console.log("尽量",last_predialysis_evaluation)
+              if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
+                this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
+                this.assessmentBeforeDislysis.blood_access_part_id = last_predialysis_evaluation.blood_access_part_id
+              }
+             
+            }
+
           } else {
             if (this.lastPredialysisEvaluation != null) {
                var blood_id = 0
           this.assessmentBeforeDislysis.blood_access_part_opera_id = lastAssessment.blood_access_part_opera_id
           this.assessmentBeforeDislysis.blood_access_part_id = lastAssessment.blood_access_part_id
            
+        }
+
+        if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
+            
+          
         }
 
         } else {

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

             <el-table-column align="center" width="50" label="序号">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+                        <el-input v-model="scope.row.groupno" placeholder=""  @input="getAllIndex(scope.row)"></el-input>
                     </div>
                 </template>
             </el-table-column>
           { name: '每六小时一次', count: 4 },
           { name: '每八小时一次', count: 3 }
         ]
+        if(this.efs!=null && this.efs.length >0){
+          for(let i=0;i<this.efs.length;i++){
+             arr.push(this.efs[i])
+          }
+       }
         let num = ''
         arr.map(item => {
           if (item.name == execution_frequency) {
         }
         return num
       },
+      getAllIndex(val){
+        console.log("val",val)
+        console.log("prescription.advices",this.prescription.advices)
+        var obj = {id:0,day:"",delivery_way:"",execution_frequency:""}
+        if(this.prescription.advices!=null && this.prescription.advices.length>0){
+           for(let i=0;i<this.prescription.advices.length;i++){
+            console.log("this.prescription.advices[i].groupno",this.prescription.advices[i].groupno)
+            if(parseInt(val.groupno) == parseInt(this.prescription.advices[i].groupno) && parseInt(val.id)!= parseInt(this.prescription.advices[i].id)){
+              console.log("this.prescription.advices[i]",this.prescription.advices[i])
+               obj.id = val.id
+               obj.day = this.prescription.advices[i].day
+               obj.delivery_way = this.prescription.advices[i].delivery_way
+               obj.execution_frequency = this.prescription.advices[i].execution_frequency
+               console.log("-----------------",obj)
+             }
+           }
+        }
+        console.log("-----------------",obj)
+
+        if(this.prescription.advices!=null && this.prescription.advices.length>0){
+           for(let i=0;i<this.prescription.advices.length;i++){
+            if(this.prescription.advices[i].id == parseInt(val.id)){
+              console.log("进啦")
+              this.prescription.advices[i].delivery_way = obj.delivery_way
+              this.prescription.advices[i].execution_frequency =obj.execution_frequency
+              this.prescription.advices[i].day = obj.day
+             }
+           }
+        }
+        console.log("hahhhahdhha",this.prescription.advices)
+      },
     }, mounted() {
       this.getInitData()