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_seventeen.vue

                 <tr>
                 <td style="text-align:left;" colspan="3">
                     <span style="display:inline-block;margin-left:15px;">治疗方式:</span>
-                    <label-box :isChecked="record.prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>&nbsp;
-                    <label-box :isChecked="record.prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;
-                    <label-box :isChecked="record.prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>&nbsp;
-                    <label-box :isChecked="record.prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp;
-                    <label-box :isChecked="record.prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>&nbsp;
+                    <label-box :isChecked="record.prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>
+                    <label-box :isChecked="record.prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>
+                    <label-box :isChecked="record.prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>
+                    <label-box :isChecked="record.prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>
+                    <label-box :isChecked="record.prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>
+                    <label-box :isChecked="record.prescription.mode_id == 3 ? true : false" showValue="HD+HP"></label-box>
                 </td>
                 <td style="text-align:left;" colspan="4">
                     <span style="display:inline-block;margin-left:15px;">诊断: {{ record.patient.diagnose }}</span>
                     </span>
                 </td>
                 <td style="text-align:left;padding-left:15px;" colspan="6">
-                    
+
                     <span style="display:inline-block;">
                     <label-box :isChecked="record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
                     <!-- <label-box :isChecked="record.prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>: -->
                     </span>
                 </td>
                 <td style="text-align:left;" colspan="3">
-                    <span style="display:flex;align-items:center;height:36px;margin-left:15px;">下机护士: 
+                    <span style="display:flex;align-items:center;height:36px;margin-left:15px;">下机护士:
                         <span  v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
                             <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'finish_nurse')" alt=""
                         srcset="" v-else style="height: 30px;">
     }
     console.log(this.bloodAccessParOpera)
 
-    
+
      var arr = [];
     var arrtwo = [];
     for (let i = 0; i < bloodAccessParOpera.length; i++) {
       this.arr = arr;
       this.arrtwo = arrtwo;
 
-      
+
     this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
 
     var dialysateFormulationOptions = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

           <tr>
             <td style="text-align:left;" colspan="3">
               <span style="display:inline-block;margin-left:15px;">治疗方式:</span>
-              <label-box :isChecked="prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>&nbsp;
-              <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;
-              <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>&nbsp;
-              <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp;
-              <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>&nbsp;
+              <label-box :isChecked="prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>
+              <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>
+              <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>
+              <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>
+              <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>
+              <label-box :isChecked="prescription.mode_id == 3 ? true : false" showValue="HD+HP"></label-box>
             </td>
             <td style="text-align:left;" colspan="4">
               <span style="display:inline-block;margin-left:15px;">诊断: {{ patientInfo.diagnose }}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

                   ? patientInfo.DialysisSchedule.device_zone.name
                   : "/"
               }}</span>
-              
+
             </div>
           </div>
           <div class="inline_block">
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-              
+
             </div>
           </div>
           <div class="inline_block">
                         }}
                       </div>
                     </div>
-                  
+
                   </div>
                   <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div
                         <span v-if="dialysisOrder != null">
                           {{dialysisOrder.dialysis_dialyszers  }}
                         </span>
-                        
+
                       </div>
                       <!--  透析(滤)器合并取值 -->
                        <div v-if="org_id==10414"
                          <span v-if="dialysisOrder != null">
                           {{dialysisOrder.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
                          </span>
-                         
+
                       </div>
                     </div>
 
                             : "/"
                         }}
                        </span>
-                      
+
                       </div>
                       <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13||prescription.anticoagulant == 14">iu</span>
                      <span v-if="prescription.anticoagulant == 15">mg</span>
-                     
+
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
                         </td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" width="10%">医生签名</td>
-                      
+
                         <td style="font-size: 16px" width="10%">执行人签名</td>
 
                         <td style="font-size: 16px" width="10%" v-if="org_id == 0 || org_id == 10677">核对人签名</td>
                           </span>
 
                         </td>
-                        <td
-                          height="32px"
-                          colspan="2"
-                          class="advice-name"
+                        <td height="32px"
+                          colspan="2" class="advice-name"
                           style="padding-left: 7px"
                         >
-
-                          <span v-if="advice.parent_id > 0"></span>
-                          <span>{{ advice.advice_name }}</span>
-                          <span v-if="advice && advice.advice_desc"
-                            >({{ advice.advice_desc
-                            }}{{ advice.drug_spec_unit }})</span
-                          >
-                          <span v-if="advice.prescribing_number"
-                            >&nbsp;&nbsp; {{ advice.prescribing_number
-                            }}{{ advice.prescribing_number_unit }}</span
-                          >
-                          <span v-if="advice.single_dose != 0">
-                            <span v-if="advice.advice_name!='血液透析滤过'&&advice.advice_name!='血液透析'&&advice.advice_name!='电脑血糖监测'">
-                              {{ advice.single_dose}}{{ advice.single_dose_unit }}
-                            </span>
-                            </span>
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.delivery_way
-                          }}</span>
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.execution_frequency
-                          }}</span>
-                          <span
-                            v-if="
-                              advice.parent_id == 0 && advice.remark.length > 0
-                            "
-                            >({{ advice.remark }})</span
-                          >
+                          <div v-if="org_id==10551 || org_id==0">
+                            <div :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
+                              <div style="border: none;">
+                                <span>{{ it.advice_name }}</span>
+                                      <span v-if="it && it.advice_desc"
+                                        >({{ it.advice_desc
+                                        }}{{ it.drug_spec_unit }})</span
+                                      >
+                                      <span v-if="it.prescribing_number"
+                                        >&nbsp;&nbsp; {{ it.prescribing_number
+                                        }}{{ it.prescribing_number_unit }}</span
+                                      >
+                                      <span v-if="it.single_dose != 0"
+                                        >{{ it.single_dose
+                                        }}{{ it.single_dose_unit }}</span
+                                      >
+                                      <span>{{ it.delivery_way}}</span>
+                                      <span>{{
+                                        it.execution_frequency
+                                      }}</span>
+                                      <span v-if="it.remark.length > 0"
+                                        >({{ it.remark }})</span
+                                      >
+                              </div>
+                            </div>
+                          </div>
+                          <div v-else>
+                            <span v-if="advice.parent_id > 0">---></span>
+                            <span>{{ advice.advice_name }}</span>
+                            <span v-if="advice && advice.advice_desc"
+                              >({{ advice.advice_desc
+                              }}{{ advice.drug_spec_unit }})</span
+                            >
+                            <span v-if="advice.prescribing_number"
+                              >&nbsp;&nbsp; {{ advice.prescribing_number
+                              }}{{ advice.prescribing_number_unit }}</span
+                            >
+                            <span v-if="advice.single_dose != 0">
+                              <span v-if="advice.advice_name!='血液透析滤过'&&advice.advice_name!='血液透析'&&advice.advice_name!='电脑血糖监测'">
+                                {{ advice.single_dose}}{{ advice.single_dose_unit }}
+                              </span>
+                              </span>
+                            <span v-if="advice.parent_id == 0">{{
+                              advice.delivery_way
+                            }}</span>
+                            <span v-if="advice.parent_id == 0">{{
+                              advice.execution_frequency
+                            }}</span>
+                            <span
+                              v-if="
+                                advice.parent_id == 0 && advice.remark.length > 0
+                              "
+                              >({{ advice.remark }})</span
+                            >
+                          </div>
+                          <!-- -->
                         </td>
 
                         <td height="32px">
                     ? patientInfo.DialysisSchedule.device_zone.name
                     : "/"
                 }}</span>
-                
+
               </div>
             </div>
             <div class="inline_block">
         //   }
         // }
 
-
-
-
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
-        if(this.org_id ==10515 || this.org_id == 0){
+        if(this.org_id ==10515 ){
           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])
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        // console.log(this.advice_groups);
+        if(this.org_id ==10551 ||this.org_id ==0){
+          var docArr = []
+          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].delivery_way!='口服'){
+                  docArr.push(this.doctor_advices[i])
+              }
+            }
+          }
+          this.doctor_advices = []
+          this.doctor_advices = docArr
 
+          if(this.doctor_advices!=null && this.doctor_advices.length>0 ){
 
+            for(let i=0;i<this.doctor_advices.length;i++){
+              this.doctor_advices[i].groupPrescriptionId = this.doctor_advices[i].prescription_id + "_"  + this.doctor_advices[i].groupno
+            }
+            console.log("医嘱内容我我哦我我哦doctor_advices",this.doctor_advices)
+
+            let dataInfo = {}
+            this.doctor_advices.forEach((item, index) => {
+
+            let { groupPrescriptionId } = item
+            if (!dataInfo[groupPrescriptionId]) {
+              dataInfo[groupPrescriptionId] = {
+                groupPrescriptionId:item.groupPrescriptionId,
+                start_time:item.start_time,
+                advice_name:item.advice_name,
+                advice_desc:item.advice_desc,
+                parent_id:item.parent_id,
+                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,
+                delivery_way:item.delivery_way,
+                execution_frequency:item.execution_frequency,
+                remark:item.remark,
+                execution_time:item.execution_time,
+                execution_staff:item.execution_staff,
+                prescriptionChild:[],
+                advice_doctor:item.advice_doctor,
+              }
+            }
+            })
+            let newArr = Object.values(dataInfo)
+
+            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].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
+                    newArr[i].prescriptionChild.push(this.doctor_advices[j])
+                }
+              }
+            }
+            }
+            console.log("newArr",newArr)
+            this.doctor_advices = []
+            this.doctor_advices = newArr
+
+          }
+        }
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
         this.patientInfo_source_1 = false;
       }
       }
-     
+
     },
 
 

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

             <span v-if="predialysis.is_hemorrhage == 2">无</span>
             <span v-if="predialysis.is_hemorrhage != 2 && predialysis.is_hemorrhage != 1">/</span>
           </div>
+          <div style="display: inline-block;width: 250px;">
+            换药护士
+            <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
+              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
+            </div>
+          </div>
         </div>
         <div class="row">
           上机医生
             <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
             <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
           </div>
-          <div v-if="predialysis.catheter ==''" style="display: inline-block;width: 250px;">
+          <div style="display: inline-block;width: 250px;">
             穿刺者
             <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
               <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
               <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
             </div>
           </div>
-          <div v-if="predialysis.catheter !=''" style="display: inline-block;width: 250px;">
-            换药护士
-            <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.change_nurse)}}</span>
-              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse)" alt="" srcset="" v-else>
-            </div>
-          </div>
+          
           上机护士
           <div class="inline_block under_line" style="width:100px;text-align: center;">
             <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                 <table class="table-box">
                   <tbody>
                     <tr>
-                      <td width="100" style="border:none;padding-left:5px">
-                        体外凝血等级: 
-                      </td>
-                      <td style="border:none;text-align:left;">
-                        
-                      </td>
-                      <td width="100" style="border:none;padding-left:5px">透析器凝血:</td>
+                      
+                      <td width="180" style="border:none;padding-left:5px">体外凝血等级透析器凝血:</td>
                       <td width="120" style="text-align:left;border:none;">
                         <span class="under_line" style="width:100px;display:inline-block">
                           {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
                           </span>
                         </div>
                       </td>
+                      <td width="70" style="border:none;padding-left:5px;">体重减少:</td>
+                      <td width="100" colspan="3" style="text-align:left;border:none;">
+                        <div>
+                          <span class="under_line" style="width:50px;display:inline-block;">
+                            {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"}}
+                          </span>kg
+                        </div>
+                      </td>
                       <td width="70" style="border:none;padding-left:5px">下机护士:</td>
                       <td width="100" style="text-align:left;border:none;">
                         <div>
       <div>
         透析液配方详情：
           <div class="inline_block">
-           钠
+           钠：
             <div
               class="under_line"
               style="width: 50px; text-align: center"