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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                         
+
 
                           <span v-if="org_id==10206">
                               {{
                               : "/"
                            }}
                           </span>
-                          
+
                           <span v-if="org_id!=10206&&org_id!=10510">
                             {{
                             record.prescription &&
                     </div>
 
                     <div
-                    
+
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                           <span>{{
                             record.lastafterweight.weight_after
                           }}</span>
-                       
+
                         </div>
                         kg
                       </div>
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460 || org_id ==10624 || org_id ==10644">ml</span> 
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460 || org_id ==10624 || org_id ==10644">ml</span>
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460 && org_id!=10624  && org_id!=10644">L</span>
                       </div>
 
                               : 0
                           }}
                         </div>
-                       
+
                         <span v-if="record.prescription.anticoagulant == 6"
                           >iu</span
                         >
                         </div>
                         ml/h
                       </div>
-                      
+
                       <span>&nbsp;&nbsp;&nbsp;</span>
                       <div class="inline_block">
                         碳酸氢钠流速：
                           <td
                             width="50"
                             v-if="
-                              org_id == 10121 || org_id == 9675 
+                              org_id == 10121 || org_id == 9675
                             "
                           >
                             SpO₂<br />(%)
                                 : ""
                               }}
                             </span>
-                           
+
                           </td>
                           <td>
                             {{
                             }}
                           </td>
 
-                      
+
                           <td
                             v-if="
                               org_id != 9538 &&
                               org_id != 10121 &&
-                              org_id != 9675 && 
+                              org_id != 9675 &&
                               org_id!=10490 &&
                               org_id!=10600 &&
                               org_id!=10644
 
                           <td
                             v-if="
-                              org_id == 10121 || org_id == 9675 
+                              org_id == 10121 || org_id == 9675
                             "
                           >
                             {{
 
                           <td
                             v-if="
-                              org_id == 10469 
+                              org_id == 10469
                             "
                           >
                             {{
                         <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
                         <td v-if="org_id == 9538"></td>
                         <td v-if="org_id == 10490 || org_id == 0"></td>
-                         
+
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
                               colspan="2"
                               class="advice-name"
                               style="padding-left: 7px"
-                              
+
                             >
                              <span v-for="(it,i) in advice.child" :key="i">
                               <span>{{ it.advice_name }}</span>
                                   it.remark.length > 0
                                 "
                                 >({{ it.remark }})</span>
-                              <span v-if="advice.child.length >1"> + </span> 
+                              <span v-if="advice.child.length >1"> + </span>
                             </span>
                             </td>
 
                 </div>
               </div>
             </div>
-            
+
             <div class="row">
               <div class="inline_block">
                 入科方式：
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          {{
+                        <span v-if="org_id != 10551">{{
                             record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss
                               : "/"
                           }}
+                         </span>
+
+                          <span v-if="org_id == 10551>{{
+                           record.assessment_after_dislysis &&
+                           record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
+                             ?  record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
+                             : "/"
+                              }}
+                            </span>
+
+
                         </div>
                         kg
                       </div>
                         style="flex: 1"
                         v-if="org_id != 10223 && org_id!=10375 && org_id!=10598"
                       >
-  
+
                         <span v-if="org_id!=10460">
                           透析中入量  (L)：
                         </span>
                               : "/"
                           }}
                         </div>
-                       
+
                       </div>
                     </div>
                     <div
                         </div>
                       </div>
 
-                  
+
                     </div>
                   <div
                     class="row"
                         </div>
                       </div>
 
-                  
+
                     </div>
                   </td>
                 </tr>
 
           //华池
           if(this.org_id == 0 || this.org_id ==10440){
-          
+
           var parint_id =0
-        
+
           if(this.records!=null&&this.records.length>0){
-            
+
             for(let i=0;i<this.records.length;i++){
              this.records[i].new_arr = []
              for(let j=0;j<this.records[i].advices.length;j++){
-             
+
                if(this.records[i].advices[j].advice_name.indexOf("低分子")!=-1){
-                 
+
                   parint_id = this.records[i].advices[j].id
                }
              }
              }
             }
 
-           
+
 
             for(let i=0;i<this.records.length;i++){
                this.records[i].advices= []
                 if(this.org_id!=10683){
                   this.records[i].monitor_records[j].end = "【结束透析】";
                 }
-              
+
                tempmonitorflag = false;
             }
             if(this.org_id!=10515 && this.org_id!=0){
                 if(this.org_id!=10683){
                   this.records[i].monitor_records[j].end = "【结束透析】";
                 }
-              
+
              }
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
                if(this.org_id!=10683){
                   this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
                }
-              
+
              }
             }
-            
+
             }
           }
           for (const recordIndex in this.records) {
 
 
             if(this.org_id ==10571){
-             
+
                if(this.records!=null&& this.records.length>0){
                 for(let i=0;i<this.records.length;i++){
                   this.records[i].advices.push(...this.records[i].his_advices)
                  }
                }
-             
+
             }
 
             var delghTwo = this.records[recordIndex].advices.length
 
 
 
-          
+
             if(this.org_id == 10206){
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
-              var delghThree = 0 
+              var delghThree = 0
              let his_project = []
               this.records[recordIndex].his_project.map(item => {
                 // if(item.type == 2){
                 //   his_project.push(item)
                 // }
                 his_project.push(item)
-              
+
               })
             this.records[recordIndex].his_project = his_project
               var delghThree = 0
           console.log("数据我哦我我", this.records);
 
 
-           
+
           if(this.records!=null && this.records.length>0){
             console.log("进啦地方大丰")
             for(let i=0;i<this.records.length;i++){
                       single_dose_unit:item.single_dose_unit,
                       parent_id:item.parent_id,
                       remark:item.remark,
-                    
+
                     }
                   }
                 })
 
                 console.log("newArrwowoow",newArr)
 
-              this.records[i].new_his_advices = [] 
+              this.records[i].new_his_advices = []
               this.records[i].new_his_advices.push(...newArr)
-              
+
             }
           }
 
-        
+
 
           console.log("时间我哦我",this.records)
-        
+
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
     //   }
     // },
     getAge: function(val) {
-     
+
      if (val.id_card_no) {
        var thisLen = val.id_card_no.length
 

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

           }else{
             data["last_after_weight"] = ""
           }
+          if(ParamsQuery.weight_loss == 0){
+
+             ParamsQuery.weight_loss = (this.predialysis_evaluation.weight_before - this.form.weight_after).toFixed(1)
+          }
 
           console.log("Paramsquery",data)
 
   },
   created() {
     // console.log("this.form", this.form.consciousness);
-   
+
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     this.pip_coagulationOptions = getDataConfig('hemodialysis','pip_coagulation')

src/xt_pages/dialysis/doctorNewProjectStaticPrint.vue

               }
             })
             let arr = Object.values(dataInfo)
+            console.log("总过---------------------------",arr)
+          
             
             if(arr!=null && arr.length >0){
               for(let i =0;i<arr.length;i++){
                 for(let j=0;j<newArr.length;j++){
                    if(arr[i].project_id == newArr[j].project_id){
-                      arr[i].child.push(newArr[i])
+                      arr[i].child.push(newArr[j])
                    }
                 } 
               }
+             
               for(let i =0;i<arr.length;i++){
                 for(let j=0;j<arr[i].child.length;j++){
                    arr[i].count += parseInt(arr[i].child[j].count)
                 }
               }
 
-              console.log("arr0000000000000000000000",arr)
+              console.log("arr444444444444444444444444",arr)
               this.tableProjectList = []
               this.tableProjectList = arr
 

src/xt_pages/dialysis/newDoctorAdvice.vue

               for(let i =0;i<arr.length;i++){
                 for(let j=0;j<newArr.length;j++){
                    if(arr[i].project_id == newArr[j].project_id){
-                      arr[i].child.push(newArr[i])
+                      arr[i].child.push(newArr[j])
                    }
                 }
               }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-            
+
               <span v-if="org_id ==9538 || org_id==0">
                 <span v-if="receiverTreatmentAccess.condition != 1">
                   {{
                   dialysisOrder.DeviceNumber.number.length > 0
                     ? dialysisOrder.DeviceNumber.number
                     : patientInfo.DialysisSchedule.device_number.number
-                
+
                  }}
                </span>
               </span>
                       </div>
                     </div>
 
-                  
+
 
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id ==10683">
                       上机时间：
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-            
+
               <span v-if="org_id ==9538 || org_id==0">
                 <span v-if="receiverTreatmentAccess.condition != 1">
                   {{
                   dialysisOrder.DeviceNumber.number.length > 0
                     ? dialysisOrder.DeviceNumber.number
                     : patientInfo.DialysisSchedule.device_number.number
-                
+
                  }}
                </span>
               </span>
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        <span v-if="org_id!=10598">{{
+                        <span v-if="org_id!=10598 && org_id!=10551">{{
                           afterdialysis.weight_loss
                             ? afterdialysis.weight_loss
                             : "/"
                            }}
                          </span>
-                         <span v-if="org_id ==10598">
+                         <span v-if="org_id ==10598 || org_id == 10551">
                           {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
                          </span>
 
           this.doctor_advices[index]["isShow"] = 2;
         }
 
-          
+
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
         if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id==10478){

src/xt_pages/user/firstDiseasePrint.vue

                   {{getDoctor(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))}}
                   </span>
                   <span v-else>
-                    <img style="height:50px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
+                    <img style="height:100px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
                   </span>
               </div>
           </div>