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

@@ -291,7 +291,7 @@
                         </div>
                       </div>
                     </div>
-                    <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
+                    <!-- <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
                       <div class="inline_block" style="flex: 1;">
                         合并症：
                         <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
@@ -303,7 +303,7 @@
                          {{ record.assessment_before_dislysis.remark ? record.assessment_before_dislysis.remark : '/' }}
                         </div>
                       </div>
-                    </div>
+                    </div> -->
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">
                       <div class="inline_block" style="flex: 1;">
                         干体重：

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -87,7 +87,7 @@
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="record.patient.source == 2"></check-box>
                 </div>
-              </div> 
+              </div>
             </span>
 
             <span v-if="org_id ==0 || org_id==10677">
@@ -108,9 +108,9 @@
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="false"></check-box>
                 </div>
-              </div> 
+              </div>
             </span>
-           
+
 
             <div class="inline_block" v-if="org_id!=10510">
               病区：
@@ -1825,8 +1825,8 @@
                               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[0].prescriptionChild.length"  v-for="(it,key)  in advice[0].prescriptionChild" style="border: none;">
                                   <div style="border: none;">
                                     <span>{{ it.advice_name }}</span>
@@ -1851,8 +1851,24 @@
                                           >
                                   </div>
                                 </div>
-                              </div>
-                              <div v-else>
+                              </div> -->
+                              <div >
+                                <template v-if="advice[0].children!=undefined && (org_id==10551||org_id == 0)">
+                                  <div v-for="(item,index) in advice[0].children" :key="index">
+                                    {{ item.advice_name }}
+                                    <span v-if="item.advice_desc">
+                                      ({{ item.advice_desc}}{{ item.drug_spec_unit }})
+                                    </span>
+                                    <span v-if="item.prescribing_number">
+                                      &nbsp;&nbsp; {{ item.prescribing_number}}
+                                      {{ item.prescribing_number_unit }}
+                                    </span>
+                                    <span v-if="item.single_dose !=''">
+                                      {{ item.single_dose}}{{ item.single_dose_unit }}
+                                    </span>
+                                    
+                                  </div>
+                                </template>
                                 <span v-if="advice[0].parent_id > 0"></span>
                                 <span>{{ advice[0].advice_name }}</span>
 
@@ -3252,10 +3268,10 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
-         
+
           var tempmonitorflag = true;
           for(let i=0;i<this.records.length;i++){
-           
+
             for(let j=0;j<this.records[i].monitor_records.length;j++){
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
@@ -3281,8 +3297,8 @@ export default {
             } else {
               dlegh = 0;
             }
-            
-            
+
+
             if (dlegh > 0) {
               if (
                 typeof this.records[recordIndex].monitor_records ===
@@ -3318,12 +3334,12 @@ export default {
                 this.records[recordIndex].advices.push([]);
               }
             }
-            console.log('22222222',this.records[recordIndex].advices);
-            
+            console.log('222222221111',this.records[recordIndex].advices);
+
             var childMap = {};
             for (const index in this.records[recordIndex].advices) {
-              
-              this.records[recordIndex].advices[index].prescriptionChild = []
+
+              // this.records[recordIndex].advices[index].prescriptionChild = []
               if (this.records[recordIndex].advices[index].parent_id == 0) {
                 continue;
               }
@@ -3351,25 +3367,24 @@ 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 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);
+
             var leftAdvice = [];
             var rightAdvice = [];
             var adlen = advices.length;

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -264,7 +264,7 @@
                     </div>
                   </div>
 
-                  <div class="row" style="display: flex">
+                  <!-- <div class="row" style="display: flex">
                     <div class="inline_block" style="flex: 1;">
                       合并症：
                       <div class="under_line"
@@ -273,7 +273,7 @@
                         {{ predialysis.complication ? predialysis.complication : "/" }}
                       </div>
                     </div>
-                  </div>
+                  </div> -->
 
                   <div class="row" style=" display: flex">
                     <div class="inline_block" style="flex: 1;">
@@ -482,7 +482,7 @@
                         "
                       >
                       <span v-if="predialysis.weight_before && afterdialysis.weight_after &&
-                          parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) - 
+                          parseFloat( predialysis.weight_before - predialysis.additional_weight ).toFixed(1) -
                           parseFloat( afterdialysis.weight_after - afterdialysis.additional_weight).toFixed(1)==0
                       ">
                           0
@@ -491,7 +491,7 @@
                         {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/"}}
                       </span>
 
-                        
+
                       </div>kg
                     </div>
                     <div class="inline_block" style="flex:1;">
@@ -1815,7 +1815,7 @@ export default {
 
     checkData() {
       console.log('new_date',this.new_date);
-      
+
       var checkDate =[]
       var monearr = []
       // if(this.dialysisOrder != undefined && this.dialysisOrder.end_time > this.new_date){
@@ -1840,10 +1840,12 @@ export default {
         } if (this.predialysis.internal_fistula == "" || this.predialysis.catheter == "") {
           const obj6 = "透前内瘘,导管"
           checkDate.push(obj6)
-        } if (this.predialysis.complication == "" ) {
-          const obj7 = "合并症"
-          checkDate.push(obj7)
-        } if (this.predialysis.dry_weight == '' ) {
+        }
+        // if (this.predialysis.complication == "" ) {
+        //   const obj7 = "合并症"
+        //   checkDate.push(obj7)
+        // }
+        if (this.predialysis.dry_weight == '' ) {
           const obj8 = "干体重"
           checkDate.push(obj8)
         } if ( this. predialysis.weight_before == '') {
@@ -1887,8 +1889,8 @@ export default {
           const obj20 = "透后体重"
           checkDate.push(obj20)
         }
-        if (this.afterdialysis.weight_loss == '' && 
-            this.predialysis.weight_before =='' && 
+        if (this.afterdialysis.weight_loss == '' &&
+            this.predialysis.weight_before =='' &&
             this.afterdialysis.weight_after == ''
         ) {
           const obj21 = "体重减少"
@@ -1927,11 +1929,11 @@ export default {
         ){
           const obj30 = "透析器"
           checkDate.push(obj30)
-        } 
+        }
         // if (this.predialysis.machine_type == 0) {
         //   const obj31 = "透析机型"
         //   checkDate.push(obj31)
-        // } 
+        // }
         if ( this.dialysisOrder !=undefined && this.dialysisOrder.DeviceNumber.number == 0) {
           const obj32 = "机号"
           checkDate.push(obj32)
@@ -2049,7 +2051,7 @@ export default {
         if(this.dialysisOrder !=undefined && this.dialysisOrder.end_time != 0){
           if(this.monitors.length >0){
             for(let i in this.monitors){
-              if(this.dialysisOrder.end_time >= this.monitors[i].operate_time && 
+              if(this.dialysisOrder.end_time >= this.monitors[i].operate_time &&
                 this.monitors[i].dispose.indexOf('停') <=-1 && this.monitors[i].ultrafiltration_rate!=0
               ){
                   console.log('1111111111',this.dialysisOrder.end_time,this.monitors[i].operate_time);
@@ -2088,12 +2090,12 @@ export default {
                   checkDate.push(obj62)
                 }
               }
-              
+
 
             }
           }
         }
-        
+
         // if(monearr.length>0){
         // checkDate =checkDate.concat(monearr)
         //   console.log('1111',checkDate.concat(monearr));
@@ -2831,8 +2833,8 @@ export default {
           cancelButtonText: '取消',
           type: 'warning',
           dangerouslyUseHTMLString: true,
-        })       
-        
+        })
+
         // this.$message({
         //   dangerouslyUseHTMLString: true,
         //   message:message,

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1564,33 +1564,23 @@
                           colspan="2" class="advice-name"
                           style="padding-left: 7px"
                         >
-                          <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 !=''"
-                                        >({{ it.remark }})</span
-                                      >
+                          <div >
+                            <template v-if="advice.children!=undefined && (org_id==10551||org_id == 0)">
+                              <div v-for="(item,index) in advice.children" :key="index">
+                                {{ item.advice_name }}
+                                <span v-if="item.advice_desc">
+                                  ({{ item.advice_desc}}{{ item.drug_spec_unit }})
+                                </span>
+                                <span v-if="item.prescribing_number">
+                                  &nbsp;&nbsp; {{ item.prescribing_number}}
+                                  {{ item.prescribing_number_unit }}
+                                </span>
+                                <span v-if="item.single_dose !=''">
+                                  {{ item.single_dose}}{{ item.single_dose_unit }}
+                                </span>
+                                
                               </div>
-                            </div>
-                          </div>
-                          <div v-else>
+                            </template>
                             <span v-if="advice.parent_id > 0">---></span>
                             <span>{{ advice.advice_name }}</span>
                             <span v-if="advice && advice.advice_desc"
@@ -3367,7 +3357,8 @@ export default {
 
         this.users = response.data.data.users;
         this.patientInfo = response.data.data.patientInfo;
-
+        console.log('response.data.data',response.data.data);
+        
         this.patientInfo.birth = uParseTime(
           this.patientInfo.birthday,
           "{y}-{m}-{d}"
@@ -3765,6 +3756,15 @@ export default {
           }
         }
 
+        if(this.org_id ==10551 ||this.org_id ==0){
+          for(let i in this.doctor_advices){
+            if(this.doctor_advices[i].parent_id >0){
+              this.doctor_advices.splice(i,1)
+            }
+          }
+        }
+        
+
         this.totollength = this.doctor_advices.length + this.monitors.length;
         console.log("this.totollength",this.totollength)
         if (this.totollength > 18) {
@@ -3779,76 +3779,11 @@ export default {
               doctor_advices_2.push(element);
             }
           }
+          
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        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])
-                  }
-                }
-              }
-            }
-            for(let i in newArr){
-              if(newArr[i].parent_id == undefined){
-                newArr.splice(i,1)
-              }
-            }
-            console.log("newArr",newArr)
-            this.doctor_advices = []
-            this.doctor_advices = newArr
-
-          }
-        }
+        
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");