11月20日，打印单

src/pages/main/template/DialysisPrintOrderSeventeen.vue

@@ -104,6 +104,11 @@
                   showValue="HF"
                   ></label-box
                   >&nbsp;
+                  <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;"

src/pages/main/template/DialysisPrintOrderSixtyeight.vue

@@ -828,14 +828,68 @@
                           <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                         </td>
                         <td height="35px" colspan="2" class="advice-name" style="padding-left:7px;" >
-                          <span v-if="advice.parent_id > 0">---></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>
+                                      <!-- {{ it.remark }} -->
+                                     <span v-if="it.remark!=''">{{ 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>
+                          <!-- <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">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                           <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</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>
+                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span> -->
                         </td>
                         <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
                           <span>{{advice.delivery_way}}</span>
@@ -1864,7 +1918,68 @@ export default {
         }
         this.totollength = this.doctor_advices.length + this.monitors.length
         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])
+                }
+              }
+            }
+            }
+            
+            this.doctor_advices = []
+            this.doctor_advices = newArr
+            console.log("newArr",this.doctor_advices)
+          }
+        }
       } else {
         this.loading = false
         this.$message.error('请求数据失败')

src/pages/main/template/DialysisPrintOrdereightytwo.vue

@@ -558,7 +558,7 @@
         <div style="font-size: 14px;">
           透析液配方详情：
           <div class="inline_block">
-          钠
+          钠：
             <div
               class="under_line"
               style="width: 50px; text-align: center"