Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -650,9 +650,9 @@
                               v-if="
                                 (dialysisOrder &&
                                 monitor.operate_time ==
-                                  dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
+                                  dialysisOrder.start_time)
                               "
-                              >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
+                              >【开始透析】 <span>引血100ml/min</span>
                               </template>
 
                             {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
@@ -1832,14 +1832,14 @@ export default {
           if (Object.keys(monitor).length > 0 && index > 1) {
             if (monitor.operate_time == this.dialysisOrder.end_time) {
             if(this.org_id!=10683){
-              this.monitors[index].end = '【结束透析】'
+              this.monitors[index].end = '【结束透析】回血100ml/min'
             }
              
               tempmonitorflag = false
             }
             if (tempmonitorflag && index == this.monitors.length - 1) {
               if(this.org_id!=10683){
-                this.monitors[index].end = '【结束透析】'
+                this.monitors[index].end = '【结束透析】回血100ml/min'
               }
              
             }
@@ -1903,110 +1903,46 @@ 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++) {
-          this.doctor_advices[index]['isShow'] = 2
+       const advice = response.data.data.advices
+        for(let i in advice){
+          if(advice[i].id !=undefined ){
+            console.log('response.data.data',this.doctor_advices);
+            this.doctor_advices = advice
+            //  response.data.data.advices == null ? [] : response.data.data.advices
+          }
         }
-
-        // if (this.doctor_advices.length > 0) {
-        //   var group = this.newAdviceGroupObject()
-        //   var initGroupBlock = function(group, advice) {
-        //     group.group_no = advice.groupno
-        //   }
-        //   for (let index = this.doctor_advices.length - 1; index >= 0; index--) {
-        //     var new_advice_index = 0
-
-        //     if ('children' in this.doctor_advices[index] && this.doctor_advices[index].children.length > 0) {
-        //       new_advice_index = index + this.doctor_advices[index].children.length + 1
-
-        //       var doctor_advice = {
-        //         delivery_way: this.doctor_advices[index].delivery_way,
-        //         execution_frequency: this.doctor_advices[index].execution_frequency,
-        //         groupno: this.doctor_advices[index].groupno,
-        //         id: this.doctor_advices[index].id,
-        //         parent_id: this.doctor_advices[index].parent_id,
-        //         children: this.doctor_advices[index].children,
-        //         remark: this.doctor_advices[index].remark,
-        //         execution_staff: this.doctor_advices[index].execution_staff,
-        //         checker: this.doctor_advices[index].checker,
-        //         execution_time: this.doctor_advices[index].execution_time,
-        //         advice_doctor: this.doctor_advices[index].advice_doctor
-
-        //       }
-        //       doctor_advice['isShow'] = 1
-        //       this.doctor_advices.splice(new_advice_index, 0, doctor_advice)
-        //       // this.doctor_advices.push(doctor_advice)
-        //     }
-        //   }
-
-        //   for (let index = 0; index < this.doctor_advices.length; index++) {
-        //     const advice = this.doctor_advices[index]
-        //     if (advice.groupno == 0) {
-        //       // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
-        //       if (advice.parent_id > 0) {
-        //         if (this.advice_groups.length > 0) {
-        //           var parent_group = this.advice_groups[
-        //             this.advice_groups.length - 1
-        //           ]
-        //           if (parent_group.advices.length > 0) {
-        //             if (parent_group.advices[0].id == advice.parent_id) {
-        //               parent_group.advices.push(advice)
-        //             }
-        //           }
-        //         }
-        //         continue
-        //       } else {
-        //         if (group.group_no > 0) {
-        //           this.advice_groups.push(group)
-        //           group = this.newAdviceGroupObject()
-        //         }
-
-        //         initGroupBlock(group, advice)
-        //         group.advices.push(advice)
-        //         this.advice_groups.push(group)
-        //         group = this.newAdviceGroupObject()
-        //         continue
-        //       }
-        //     }
-
-        //     if (group.group_no > 0 && group.group_no != advice.groupno) {
-        //       this.advice_groups.push(group)
-        //       group = this.newAdviceGroupObject()
-        //     }
-        //     if (group.group_no == 0) {
-        //       initGroupBlock(group, advice)
-        //     }
-        //     if (group.group_no == advice.groupno) {
-        //       group.advices.push(advice)
+        const advicearr = []
+        for(let i in this.doctor_advices){
+          if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
+            advicearr.push(this.doctor_advices[i])
+          }
+        }
+        this.doctor_advices = []
+        this.doctor_advices = advicearr
+
+        // for (let index = 0; index < this.doctor_advices.length; index++) {
+        //   this.doctor_advices[index]['isShow'] = 2
+        // }&& (advice[i].delivery_way !='口服' || advice[i].delivery_way!='中药口服')
+
+        // if (this.doctor_advices.length <= 6) {
+        //   var nl = 6
+        //   this.print_length = 6
+
+        //   for (let index = 0; index < nl; index++) {
+            
+        //     if (
+        //       this.doctor_advices[index] == undefined ||
+        //       this.doctor_advices[index].length <= 0  
+        //     ) {
+        //       this.doctor_advices.push([])
+        //       console.log('1234567',this.doctor_advices)
+        //     } else {
+        //       continue
         //     }
         //   }
-
-        //   if (group.group_no > 0) {
-        //     // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-        //    this.advice_groups.push(group)
-        //   }
         // }
-
-        if (this.doctor_advices.length <= 6) {
-          var nl = 6
-          this.print_length = 6
-
-          for (let index = 0; index < nl; index++) {
-            if (
-              this.doctor_advices[index] == undefined ||
-              this.doctor_advices[index].length <= 0
-            ) {
-              this.doctor_advices.push([])
-            } else {
-              continue
-            }
-          }
-        }
-        this.totollength = this.doctor_advices.length + this.monitors.length
-        console.log(this.advice_groups)
+        // this.totollength = this.doctor_advices.length + this.monitors.length
+        
        
       } else {
         this.loading = false
@@ -2093,11 +2029,9 @@ export default {
     },
     getshouji(id){
       const options = this.anticoagulantsConfit
-      console.log('anticoagulantsConfit11111',id,options[id].shouji_unit);
       if(id != 0){
         for(let i in options){
           if(id == options[i].id){
-            console.log('anticoagulantsConfit11111',id); 
             return options[i].shouji_unit
           }
         }