Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -662,7 +662,7 @@
                           <td>{{monitor_record.blood_flow_volume? monitor_record.blood_flow_volume: ""}}</td>
                           <td>{{monitor_record.replacement_rate ? monitor_record.replacement_rate : '/'}}</td>
                           <td>{{monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}</td>
-                          <td>{{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: ""}}</td>
+                          <td>{{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0"}}</td>
                           <td>{{ monitor_record.venous_pressure ? monitor_record.venous_pressure : "/"}}</td>
                           <td>{{ monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure : ""}}</td>
                           <td>{{ monitor_record.sodium_concentration ? monitor_record.sodium_concentration : "" }}</td>
@@ -899,6 +899,7 @@
                                 <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                             </td>
                           </tr>
+                        
                         </template>
                       </tbody>
                     </table>
@@ -1896,31 +1897,34 @@ export default {
                 this.records[i].his_advices.forEach((item,index)=>{
                   // console.log("itemwowowowowo",item)
                   let { new_groupno } = item
-                  if(!objInfo[new_groupno]){
-                    objInfo[new_groupno] = {
-                      new_groupno,
-                      child:[],
-                      start_time:item.start_time,
-                      advice_doctor:item.advice_doctor,
-                      advice_name:item.advice_name,
-                      check_time:item.check_time,
-                      checker:item.checker,
-                      delivery_way:item.delivery_way,
-                      execution_frequency:item.execution_frequency,
-                      execution_staff:item.execution_staff,
-                      execution_state:item.execution_state,
-                      execution_time:item.execution_time,
-                      frequency_type:item.frequency_type,
-                      new_groupno:item.new_groupno,
-                      advice_desc:item.advice_desc,
-                      drug_spec_unit:item.drug_spec_unit,
-                      prescribing_number:item.prescribing_number,
-                      prescribing_number_unit:item.prescribing_number_unit,
-                      single_dose:item.single_dose,
-                      single_dose_unit:item.single_dose_unit,
-                      parent_id:item.parent_id,
-                      remark:item.remark,
-
+                  if(item.delivery_way !='口服' && item.delivery_way!='中药口服'){
+                    if(!objInfo[new_groupno] ){
+                      console.log('66666666',item);
+                      objInfo[new_groupno] = {
+                        new_groupno,
+                        child:[],
+                        start_time:item.start_time,
+                        advice_doctor:item.advice_doctor,
+                        advice_name:item.advice_name,
+                        check_time:item.check_time,
+                        checker:item.checker,
+                        delivery_way:item.delivery_way,
+                        execution_frequency:item.execution_frequency,
+                        execution_staff:item.execution_staff,
+                        execution_state:item.execution_state,
+                        execution_time:item.execution_time,
+                        frequency_type:item.frequency_type,
+                        new_groupno:item.new_groupno,
+                        advice_desc:item.advice_desc,
+                        drug_spec_unit:item.drug_spec_unit,
+                        prescribing_number:item.prescribing_number,
+                        prescribing_number_unit:item.prescribing_number_unit,
+                        single_dose:item.single_dose,
+                        single_dose_unit:item.single_dose_unit,
+                        parent_id:item.parent_id,
+                        remark:item.remark,
+
+                      }
                     }
                   }
                 })

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -605,7 +605,7 @@
                             text-align: center;
                             font-weight: 520;
                             font-size: 16px;
-                            padding: 0px 8px;
+                            padding: 6px 8px;
                             line-height: 30px;
                           "
                         >
@@ -639,12 +639,12 @@
                         <td width="200">病情变化及处理</td>
                       </tr>
                       <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="">
-                        <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
-                        <td>{{monitor.replacement_rate ? monitor.replacement_rate : '/'}}</td>
-                        <td>{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</td>
-                        <td>{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
-                        <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "/"}}</td>
+                        <td height="40px">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                        <td >{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
+                        <td >{{monitor.replacement_rate ? monitor.replacement_rate : '/'}}</td>
+                        <td >{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</td>
+                        <td >{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</td>
+                        <td >{{ monitor.venous_pressure ? monitor.venous_pressure : "/"}}</td>
                         <td>{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ""}}</td>
                         <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
                         <!-- 温度 -->
@@ -703,7 +703,7 @@
                             text-align: center;
                             font-weight: 520;
                             font-size: 16px;
-                            padding: 0px 8px;
+                            padding: 6px 8px;
                             line-height: 30px;
                           "
                         >
@@ -712,7 +712,7 @@
                       </tr>
 
                       <tr style="line-height: 35px; padding: 8px 5px">
-                        <td style="font-size: 16px" width="10%">时间</td>
+                        <td style="font-size: 16px;height: 32px;" width="10%">时间</td>
                         <td style="font-size: 16px" colspan="2" width="45%">
                           医嘱内容
                         </td>
@@ -819,7 +819,7 @@
                     text-align: center;
                     font-weight: 520;
                     font-size: 16px;
-                    padding: 0px 8px;
+                    padding: 6px 8px;
                     line-height: 30px;
                   "
                 >
@@ -2284,7 +2284,7 @@ export default {
         }
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id == 10489 || this.org_id == 0){
+        if(this.org_id == 10489 ){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -2295,184 +2295,186 @@ export default {
         }
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
 
-        //华池
-        if(this.org_id == 10440){
-           var parint_id =0
-           var newArr = []
-           if(this.doctor_advices!=null&&this.doctor_advices.length>0){
-
-             for(let i=0;i<this.doctor_advices.length;i++){
-               if(this.doctor_advices[i].advice_name.indexOf("低分子")!=-1){
-                 parint_id = this.doctor_advices[i].id
-               }
-             }
-
-             for(let i=0;i<this.doctor_advices.length;i++){
-               if(this.doctor_advices[i].id != parint_id && this.doctor_advices[i].parent_id!=parint_id){
-                  newArr.push(this.doctor_advices[i])
-               }
-             }
-             this.doctor_advices =[]
-             this.doctor_advices = newArr
-           }
-        }
+        // //华池
+        // if(this.org_id == 10440){
+        //    var parint_id =0
+        //    var newArr = []
+        //    if(this.doctor_advices!=null&&this.doctor_advices.length>0){
 
-        //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id ==10644 || this.org_id == 0){
-          if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
+        //      for(let i=0;i<this.doctor_advices.length;i++){
+        //        if(this.doctor_advices[i].advice_name.indexOf("低分子")!=-1){
+        //          parint_id = this.doctor_advices[i].id
+        //        }
+        //      }
 
-            for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
-              this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
-              console.log("寄哪里 222")
+        //      for(let i=0;i<this.doctor_advices.length;i++){
+        //        if(this.doctor_advices[i].id != parint_id && this.doctor_advices[i].parent_id!=parint_id){
+        //           newArr.push(this.doctor_advices[i])
+        //        }
+        //      }
+        //      this.doctor_advices =[]
+        //      this.doctor_advices = newArr
+        //    }
+        // }
 
-            }
-         }
+        // //HIS客户显示临时医嘱的地方
+        // if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id ==10644 || this.org_id == 0){
+        //   if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
+        //     for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
+        //       this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
+        //       console.log("寄哪里 222")
 
+        //     }
+        //  }
 
-         let projects = [];
-        response.data.data.projects.map((item) => {
-          if (item.type == 2) {
-            projects.push(item);
-          }
-        });
-        this.projects = projects;
 
 
-        // console.log("this.projects=========================================", this.projects);
+        //  let projects = [];
+        // response.data.data.projects.map((item) => {
+        //   if (item.type == 2) {
+        //     projects.push(item);
+        //   }
+        // });
+        // this.projects = projects;
 
 
+        // // console.log("this.projects=========================================", this.projects);
+
 
-        if(this.org_id!=10510 &&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=10489){
-            console.log("列表===================================",this.projects)
-            var newHisArr = []
-            if(this.projects!=null && this.projects.length >0){
-             for(let i=0;i<this.projects.length;i++){
-              if(this.projects[i].type== 2){
 
-                this.projects[i].project_team_name = ""
-                this.projects[i].project_team_id = 0
+        // if(this.org_id!=10510 &&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=10489){
+        //     console.log("列表===================================",this.projects)
+        //     var newHisArr = []
+        //     if(this.projects!=null && this.projects.length >0){
+        //      for(let i=0;i<this.projects.length;i++){
+        //       if(this.projects[i].type== 2){
 
-                if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+        //         this.projects[i].project_team_name = ""
+        //         this.projects[i].project_team_id = 0
 
-                  this.projects[i].project_team = this.projects[i].team.project_team
-                  this.projects[i].project_team_id = this.projects[i].team.id
-                  this.projects[i].start_time = this.projects[i].start_time
-                  this.projects[i].single_dose = this.projects[i].single_dose
-                  this.projects[i].single_dose_unit = this.projects[i].unit
-                  this.projects[i].execution_time = this.projects[i].execution_time
-                  this.projects[i].execution_staff= this.projects[i].execution_staff
-                  this.projects[i].advice_name =  this.projects[i].team.project_team
-                  this.projects[i].advice_doctor = this.projects[i].doctor
+        //         if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+
+        //           this.projects[i].project_team = this.projects[i].team.project_team
+        //           this.projects[i].project_team_id = this.projects[i].team.id
+        //           this.projects[i].start_time = this.projects[i].start_time
+        //           this.projects[i].single_dose = this.projects[i].single_dose
+        //           this.projects[i].single_dose_unit = this.projects[i].unit
+        //           this.projects[i].execution_time = this.projects[i].execution_time
+        //           this.projects[i].execution_staff= this.projects[i].execution_staff
+        //           this.projects[i].advice_name =  this.projects[i].team.project_team
+        //           this.projects[i].advice_doctor = this.projects[i].doctor
 
 
-                  newHisArr.push(this.projects[i])
-                  // this.doctor_advices_2.push(this.project[i])
-                }else{
-                  this.projects[i].project_team = this.projects[i].project.project_name
-                  this.projects[i].advice_name = this.projects[i].project.project_name
-                  this.projects[i].start_time = this.projects[i].start_time
-                  this.projects[i].single_dose = this.projects[i].single_dose
-                  this.projects[i].single_dose_unit = this.projects[i].unit
-                  this.projects[i].execution_time = this.projects[i].execution_time
-                  this.projects[i].execution_staff= this.projects[i].execution_staff
-                  this.projects[i].advice_doctor = this.projects[i].doctor
-                  newHisArr.push(this.projects[i])
+        //           newHisArr.push(this.projects[i])
+        //           // this.doctor_advices_2.push(this.project[i])
+        //         }else{
+        //           this.projects[i].project_team = this.projects[i].project.project_name
+        //           this.projects[i].advice_name = this.projects[i].project.project_name
+        //           this.projects[i].start_time = this.projects[i].start_time
+        //           this.projects[i].single_dose = this.projects[i].single_dose
+        //           this.projects[i].single_dose_unit = this.projects[i].unit
+        //           this.projects[i].execution_time = this.projects[i].execution_time
+        //           this.projects[i].execution_staff= this.projects[i].execution_staff
+        //           this.projects[i].advice_doctor = this.projects[i].doctor
+        //           newHisArr.push(this.projects[i])
+
 
+        //           // this.doctor_advices_2.push(this.projects[i])
+        //         }
 
-                  // this.doctor_advices_2.push(this.projects[i])
-                }
 
 
+        //       }
 
-              }
+        //     }
+        //     }
 
-            }
-            }
 
 
+        //     for(let i=0;i<newHisArr.length;i++){
+        //       newHisArr[i].advice_name_str = ""
+        //       newHisArr[i].advice_name_str = newHisArr[i].project_team + (newHisArr[i].prescription_id).toString()
+        //     }
+        //     console.log("newHisArr===================================",newHisArr)
+
+        //     var ordHisArr = this.getQuChong(newHisArr)
 
-            for(let i=0;i<newHisArr.length;i++){
-              newHisArr[i].advice_name_str = ""
-              newHisArr[i].advice_name_str = newHisArr[i].project_team + (newHisArr[i].prescription_id).toString()
-            }
-            console.log("newHisArr===================================",newHisArr)
+        //    this.doctor_advices.push(...ordHisArr)
+        // }
 
-            var ordHisArr = this.getQuChong(newHisArr)
 
-           this.doctor_advices.push(...ordHisArr)
-        }
+        // }
 
+        // //针对内蒙古阿拉善
+        // if(this.org_id ==10206 || this.org_id ==0){
 
-        }
+        //   if(this.doctor_advices!=null && this.doctor_advices.length > 0){
 
-        //针对内蒙古阿拉善
-        if(this.org_id ==10206 || this.org_id ==0){
+        //     for(let i=0;i<this.doctor_advices.length;i++){
+        //       this.doctor_advices[i].new_groupno = ""
+        //        this.doctor_advices[i].new_groupno = this.doctor_advices[i].prescription_id + "_" + this.doctor_advices[i].groupno
 
-          if(this.doctor_advices!=null && this.doctor_advices.length > 0){
+        //         let objInfo = {}
+        //         this.doctor_advices.forEach((item,index)=>{
+        //           let { new_groupno } = item
+        //           if(!objInfo[new_groupno]){
+        //             objInfo[new_groupno] = {
+        //               new_groupno,
+        //               child:[],
+        //               start_time:item.start_time,
+        //               advice_doctor:item.advice_doctor,
+        //               advice_name:item.advice_name,
+        //               check_time:item.check_time,
+        //               checker:item.checker,
+        //               delivery_way:item.delivery_way,
+        //               execution_frequency:item.execution_frequency,
+        //               execution_staff:item.execution_staff,
+        //               execution_state:item.execution_state,
+        //               execution_time:item.execution_time,
+        //               frequency_type:item.frequency_type,
+        //               new_groupno:item.new_groupno,
+        //               advice_desc:item.advice_desc,
+        //               drug_spec_unit:item.drug_spec_unit,
+        //               prescribing_number:item.prescribing_number,
+        //               prescribing_number_unit:item.prescribing_number_unit,
+        //               single_dose:item.single_dose,
+        //               single_dose_unit:item.single_dose_unit,
+        //               parent_id:item.parent_id,
+        //               remark:item.remark,
+
+        //             }
+        //           }
+        //         })
+        //         let newArr = Object.values(objInfo);
+
+
+        //         if(newArr!=null && newArr.length >0){
+        //           for(let i=0;i<newArr.length;i++){
+        //             for(let j=0;j<this.doctor_advices.length;j++){
+        //                if(newArr[i].new_groupno == this.doctor_advices[j].new_groupno){
+        //                   newArr[i].child.push(this.doctor_advices[j])
+        //                }
+        //             }
+        //           }
+        //         }
+
+        //         // console.log("newArrwowoow",newArr)
+
+        //       this.new_doctor_advice_list = []
+        //       this.new_doctor_advice_list.push(...newArr)
 
-            for(let i=0;i<this.doctor_advices.length;i++){
-              this.doctor_advices[i].new_groupno = ""
-               this.doctor_advices[i].new_groupno = this.doctor_advices[i].prescription_id + "_" + this.doctor_advices[i].groupno
-
-                let objInfo = {}
-                this.doctor_advices.forEach((item,index)=>{
-                  let { new_groupno } = item
-                  if(!objInfo[new_groupno]){
-                    objInfo[new_groupno] = {
-                      new_groupno,
-                      child:[],
-                      start_time:item.start_time,
-                      advice_doctor:item.advice_doctor,
-                      advice_name:item.advice_name,
-                      check_time:item.check_time,
-                      checker:item.checker,
-                      delivery_way:item.delivery_way,
-                      execution_frequency:item.execution_frequency,
-                      execution_staff:item.execution_staff,
-                      execution_state:item.execution_state,
-                      execution_time:item.execution_time,
-                      frequency_type:item.frequency_type,
-                      new_groupno:item.new_groupno,
-                      advice_desc:item.advice_desc,
-                      drug_spec_unit:item.drug_spec_unit,
-                      prescribing_number:item.prescribing_number,
-                      prescribing_number_unit:item.prescribing_number_unit,
-                      single_dose:item.single_dose,
-                      single_dose_unit:item.single_dose_unit,
-                      parent_id:item.parent_id,
-                      remark:item.remark,
-
-                    }
-                  }
-                })
-                let newArr = Object.values(objInfo);
-
-
-                if(newArr!=null && newArr.length >0){
-                  for(let i=0;i<newArr.length;i++){
-                    for(let j=0;j<this.doctor_advices.length;j++){
-                       if(newArr[i].new_groupno == this.doctor_advices[j].new_groupno){
-                          newArr[i].child.push(this.doctor_advices[j])
-                       }
-                    }
-                  }
-                }
-
-                // console.log("newArrwowoow",newArr)
-
-              this.new_doctor_advice_list = []
-              this.new_doctor_advice_list.push(...newArr)
-
-              // console.log("newArrwowoow",this.new_doctor_advice_list)
-            }
-          }
-        }
+        //       // console.log("newArrwowoow",this.new_doctor_advice_list)
+        //     }
+        //   }
+        // }
 
         console.log("新时间我哦我哦",this.doctor_advices)
 
         //过滤口服药
-        if(this.org_id == 10265){
+        if(this.org_id ==10721 ||this.org_id ==0){
+          console.log('df11111111',this.doctor_advices);
+          
           var docArr = []
           if(this.doctor_advices!=null && this.doctor_advices.length>0){
             for(let i=0;i<this.doctor_advices.length;i++){