11月20 打印单

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -193,7 +193,7 @@
                 v-for="(item, i) in way_arr"
                 class="under_line"
                 v-if="record.receive_assessment.way == item.id"
-                style="width: 180px; text-align: left"
+                style="width: 130px; text-align: left"
               >
                 {{ item.name }}
               </div>
@@ -1821,48 +1821,65 @@
                               </span>
                             </td>
 
-                            <td
-                              height="26px"
+                            <td height="26px"
                               colspan="2"
                               class="advice-name"
                               style="padding-left: 7px"
-                            >
-                              <span v-if="advice[0].parent_id > 0">---></span>
-                              <span>{{ advice[0].advice_name }}</span>
-
-                              <span
-                                v-if="
-                                  advice[0] &&
-                                  advice[0].advice_desc != undefined
-                                "
-                              >
-                                <!-- ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} ) -->
-                              </span>
-
-                              <span v-if="advice[0].prescribing_number"
-                                >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                                }}{{ advice[0].prescribing_number_unit }}</span
-                              >
-                              <span v-if="advice[0].single_dose != 0">
+                            > 
+                              <div v-if="org_id==10551 || org_id ==0">
+                                <div :rowspan="advice[0].prescriptionChild.length"  v-for="(it,key)  in advice[0].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 !=''"
+                                            >({{ it.remark }})</span
+                                          >
+                                  </div>
+                                </div>
+                              </div>
+                              <div v-else>
+                                <span v-if="advice[0].parent_id > 0"></span>
+                                <span>{{ advice[0].advice_name }}</span>
+
+                                <span v-if="advice[0].prescribing_number"
+                                  >&nbsp;&nbsp; {{ advice[0].prescribing_number
+                                  }}{{ advice[0].prescribing_number_unit }}</span
+                                >
+                                <span v-if="advice[0].single_dose != 0">
 
-                                <span v-if="advice[0].advice_name!='血液透析滤过'&& advice[0].advice_name!='血液透析' && advice[0].advice_name!='电脑血糖监测'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
-                                </span
-                              >
+                                  <span v-if="advice[0].advice_name!='血液透析滤过'&& advice[0].advice_name!='血液透析' && advice[0].advice_name!='电脑血糖监测'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
+                                  </span
+                                >
 
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].delivery_way
-                              }}</span>
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].execution_frequency
-                              }}</span>
-                              <span
-                                v-if="
-                                  advice[0].parent_id == 0 &&
-                                  advice[0].remark.length > 0
-                                "
-                                >({{ advice[0].remark }})</span
-                              >
+                                <span v-if="advice[0].parent_id == 0">{{
+                                  advice[0].delivery_way
+                                }}</span>
+                                <span v-if="advice[0].parent_id == 0">{{
+                                  advice[0].execution_frequency
+                                }}</span>
+                                <span
+                                  v-if="
+                                    advice[0].parent_id == 0 &&
+                                    advice[0].remark.length > 0
+                                  "
+                                  >({{ advice[0].remark }})</span
+                                >
+                              </div>
                             </td>
 
                             <td height="35px">
@@ -3264,6 +3281,8 @@ export default {
             } else {
               dlegh = 0;
             }
+            
+            
             if (dlegh > 0) {
               if (
                 typeof this.records[recordIndex].monitor_records ===
@@ -3276,7 +3295,6 @@ export default {
                 this.records[recordIndex].monitor_records.push([]);
               }
             }
-
             this.records[recordIndex].isShowZero = false;
             if (this.records[recordIndex].patient.user_org_id == 9535) {
               this.records[recordIndex].isShowZero = true;
@@ -3300,9 +3318,12 @@ export default {
                 this.records[recordIndex].advices.push([]);
               }
             }
-
+            console.log('22222222',this.records[recordIndex].advices);
+            
             var childMap = {};
             for (const index in this.records[recordIndex].advices) {
+              
+              this.records[recordIndex].advices[index].prescriptionChild = []
               if (this.records[recordIndex].advices[index].parent_id == 0) {
                 continue;
               }
@@ -3320,6 +3341,7 @@ export default {
             }
 
             var advices = [];
+            // var advices2 = []
             for (const index in this.records[recordIndex].advices) {
               if (this.records[recordIndex].advices[index].parent_id > 0) {
                 continue;
@@ -3329,10 +3351,25 @@ export default {
                 item.children = childMap[item.id];
               } else {
                 item.children = [];
+                this.records[recordIndex].advices[index].prescriptionChild.push(item) 
               }
               advices.push(item);
+              
             }
-
+            var arr = []
+            for(let i=0;i<advices.length;i++){
+              for(let j=i+1;j<advices.length;j++){
+                if(advices[i].id !=undefined){
+                  if(advices[i].groupno == advices[j].groupno){
+                    arr.push(advices[j])
+                    advices[i].prescriptionChild.push(advices[j])
+                    advices.splice(j,1)
+                  }
+                }
+              }
+            }
+            console.log('3333333333',advices,arr);
+            
             var leftAdvice = [];
             var rightAdvice = [];
             var adlen = advices.length;

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1564,7 +1564,7 @@
                           colspan="2" class="advice-name"
                           style="padding-left: 7px"
                         >
-                          <div v-if="org_id==10551 || org_id==0">
+                          <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>
@@ -1584,7 +1584,7 @@
                                       <span>{{
                                         it.execution_frequency
                                       }}</span>
-                                      <span v-if="it.remark.length > 0"
+                                      <span v-if="it.remark !=''"
                                         >({{ it.remark }})</span
                                       >
                               </div>
@@ -3830,13 +3830,18 @@ export default {
             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])
+              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])
+                  }
                 }
               }
             }
+            for(let i in newArr){
+              if(newArr[i].parent_id == undefined){
+                newArr.splice(i,1)
+              }
             }
             console.log("newArr",newArr)
             this.doctor_advices = []

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -328,7 +328,7 @@
                 </tr>
             </table>
           </div>
-          <div style="margin-bottom: 10px;" v-if="org_id!=0&& org_id!=10375">
+          <div style="margin-bottom: 10px;" v-if="org_id!=10375">
             <table class="table" border="1"
               style="border-collapse: collapse;text-align: center;width: 100%;"
             >
@@ -352,7 +352,7 @@
                   height="32px"
                   class="advice-name"
                   style="padding-left: 7px"
-                 
+
                 >
                  <div :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
                    <div style="border: none;">
@@ -373,7 +373,8 @@
                           <span>{{
                             it.execution_frequency
                           }}</span>
-                          <span v-if="it.remark.length > 0"
+                          
+                          <span v-if="it.remark !=''"
                             >({{ it.remark }})</span
                           >
                    </div>
@@ -466,7 +467,7 @@
                 </td>
                 <td>
                   <span>透析器凝血：
-                   
+
                     {{
                      afterdialysis &&
                      afterdialysis
@@ -474,19 +475,19 @@
                         : "/"
                      }}
 
-                 
+
                   </span>
                 </td>
                 <td>
                   <span>实际置换量：
-                   
+
                     {{
                       afterdialysis.actual_displacement
                         ? afterdialysis.actual_displacement
                         : ""
                      }}L
 
-                 
+
                   </span>
                 </td>
               </tr>
@@ -526,7 +527,7 @@
                 <td width="5%">医生：</td>
                 <td width="10%">
                   <!-- <span>{{getAdminUser(prescription.creater)}}</span> -->
-                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span> 
+                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span>
                   <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor==0">{{getAdminUser(prescription.creater)}}</span>
                   <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else> -->
                 </td>
@@ -1302,6 +1303,8 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
+
+
         this.doctor_advices =
           response.data.data.advices == null ? [] : response.data.data.advices;
         for (let index = 0; index < this.doctor_advices.length; index++) {
@@ -1351,23 +1354,23 @@ export default {
              }
            }
         }
-        this.doctor_advices = [] 
+        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 
+              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] = {
@@ -1392,7 +1395,7 @@ export default {
             }
           })
           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++){
@@ -1403,12 +1406,16 @@ export default {
              }
           }
           console.log("newArr",newArr)
-            
+          for(let i in newArr){
+            if(newArr[i].parent_id == undefined){
+              newArr.splice(i,1)
+            }
+          }
           this.doctor_advices = []
           this.doctor_advices = newArr
-         
+
         }
-        
+
 
       } else {
         this.loading = false;