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

@@ -999,13 +999,32 @@ export default {
               this.records[recordIndex].advices.push(item);
             }
           }
-          console.log(this.records, "this.records");
+          
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
           //   o.assessment_before_dislysis.blood_access_part_opera_id)
           // })
-
+          // const advice = []
+          if(this.records.length>0){
+            console.log(this.records, "this.records");
+            for(let x in this.records){
+              
+              if(this.records[x].his_advices.length>0){
+                console.log(this.records, "this.records");
+                const arr = this.records[x].his_advices
+                for(let i in arr ){
+                  if(arr[i].delivery_way == '口服' || 
+                    arr[i].delivery_way == '中药口服' ||
+                    arr[i].delivery_way == '舌下含服'
+                  ){
+                    arr.splice(i,1)
+                  }
+                }
+              }
+              // this.records[x].his_advices =advice
+            }
+          }
           this.operators = resp.data.medical_staffs;
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;

src/xt_pages/dialysis/batch_print/batch_print_order_eightyfour.vue

@@ -325,7 +325,7 @@
                       <td>{{ advice[0].delivery_way }}</td>
                       <td>{{ getTime(advice[0].execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                       <td style="height:30px;line-height:30px">
-                        徐华
+                        <span v-if="advice[0].start_time>0">徐华</span>
                         <!-- <span v-if="advice[0].start_time>0">杨能华/</span>
                         <span v-if="setAdminUserES(advice[0],'advice_doctor') == ''">
                           {{ getAdminUser(advice[0],'advice_doctor')}}

src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue

@@ -278,7 +278,7 @@
                 <td>{{ advice.delivery_way }}</td>
                 <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                 <td style="height:30px;line-height:30px">
-                  徐华
+                  <span v-if="advice.start_time>0">徐华</span>
                   <!-- <span v-if="advice.start_time>0">徐华/</span>
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                     {{ getAdminUser(advice.advice_doctor)}}

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -1162,7 +1162,16 @@ export default {
           this.assessmentafter = response.data.data.assessmentAfterDislysis
           console.log('上次透后体重', this.assessmentafter)
           var doctorAdevieInfo = response.data.data.advices
-          var tableAdvice = doctorAdevieInfo
+          console.log('var tableAdvice',tableAdvice);
+          var tableAdvice = []
+          for(let i in doctorAdevieInfo){
+            if(doctorAdevieInfo[i].delivery_way != '口服' && 
+            doctorAdevieInfo[i].delivery_way != '中药口服' &&
+            doctorAdevieInfo[i].delivery_way != '舌下含服'){
+              tableAdvice.push(doctorAdevieInfo[i]) 
+            }
+          }
+          
           if (tableAdvice.length === 0) {
             var obj = { advice_name: '', start_time: '' }
             var obj1 = { advice_name: '', start_time: '' }

src/xt_pages/user/inspection.vue

@@ -1324,6 +1324,8 @@ export default {
             this.queryParams.project_id = this.project.project_id
             this.queryParams.page = 1
             this.total = 0
+            console.log('bbbbbvvvv',this.queryParams);
+            
             this.fetchPatientInspections(this.queryParams)
           } else {
             this.$message.error(response.data.msg)
@@ -1414,8 +1416,6 @@ export default {
             }else{
               this.is_open = false
             }
-
-
             if(remind.id > 0 && remind.remind_cycle > 0){
               this.temp_remind_cycle = remind.remind_cycle
             }else{
@@ -1438,27 +1438,26 @@ export default {
             console.log("inspectionsMap",this.inspectionsMap)
             var items = this.project.inspection_reference
             console.log("时间",items)
-            for (var index in items) {
-             console.log("obj",items[index])
+            for(let index in items){
+              console.log("obj",items)
               // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
               var item = {}
-              for (var key in items[index]) {
+              for (let key in items[index]) {
                 //  console.log("key",key,items[index][key])
                 // console.log("item[key]",items[index])
                 item[key] = items[index][key]
               }
-
-              console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
+              console.log("item=-----------------12",item,inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
               if (item.item_id > 0) {
-
-                if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
+                if(inspectionsMap[parseInt(items[index].item_id)] == null){
+                  console.log('执行1',item.project_name,inspectionsMap[items[index].id]);
                   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
-                    item.value = inspectionsMap[items[index].id].inspect_value
-                    item.item_name = inspectionsMap[items[index].id].item_name
+                    if(inspectionsMap[items[index].id] !=null){
+                      item.value = inspectionsMap[items[index].id].inspect_value
+                      item.item_name = inspectionsMap[items[index].id].item_name
+                    }
                   }else{
-                    console.log('执行1');
-
-                    if(this.org_id == 10702){
+                    if((this.org_id == 10702 || this.org_id==0) && inspectionsMap[items[index].id] !=null){
                       if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
                           item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
                           item.project_name == '传染病检查'
@@ -1471,33 +1470,73 @@ export default {
                         item.item_name = ''
                       }
                     } else{
-                      console.log('执行2');
+                      console.log('执行2',inspectionsMap[items[index].id]);
+                      // item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                      // item.item_name = inspectionsMap[items[index].id].item_name
                       item.value = ''
                       item.item_name = ''
                     }
                   }
                 } else {
-                  console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
-                  item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
-                  item.item_name = inspectionsMap[items[index].item_id].item_name
+                  if(inspectionsMap[parseInt(items[index].item_id)] != null){
+                    console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
+                    item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                    item.item_name = inspectionsMap[items[index].item_id].item_name
+                  }
                 }
                 if(this.org_id ==10191){
-                  if(item.project_name == "乙肝定性（五项)"){
+                  if(item.project_name == "乙肝定性（五项)" && inspectionsMap[items[index].id] !=null){
                     console.log("金阿迪发到付阿打发")
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }
                 }
+                // if ((inspectionsMap[parseInt(items[index].item_id)])  == null) {
+                //   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
+                //     item.value = inspectionsMap[items[index].id].inspect_value
+                //     item.item_name = inspectionsMap[items[index].id].item_name
+                //   }else{
+                //     console.log('执行1',item.project_name,inspectionsMap[items[index].id]);
+
+                //     if(this.org_id == 10702 || this.org_id==0){
+                //       if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
+                //           item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
+                //           item.project_name == '传染病检查'
+                //         ){
+
+                //         item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                //         item.item_name = inspectionsMap[items[index].id].item_name
+                //       }else{
+                //         item.value = ''
+                //         item.item_name = ''
+                //       }
+                //     } else{
+                //       console.log('执行2');
+                //       item.value = ''
+                //       item.item_name = ''
+                //     }
+                //   }
+                // } else {
+                //   console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
+                //   item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                //   item.item_name = inspectionsMap[items[index].item_id].item_name
+                // }
+                // if(this.org_id ==10191){
+                //   if(item.project_name == "乙肝定性（五项)"){
+                //     console.log("金阿迪发到付阿打发")
+                //     item.value = inspectionsMap[items[index].id].inspect_value
+                //     item.item_name = inspectionsMap[items[index].id].item_name
+                //   }
+                // }
               } else {
-                if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
+                if(typeof(inspectionsMap[parseInt(items[index].id)])  == null){
                   continue
+                }else{
+                  console.log('执行4',inspectionsMap);
+                  item.value = inspectionsMap[items[index].id].inspect_value
+                  item.item_name = inspectionsMap[items[index].id].item_name
                 }
-                console.log('执行4',inspectionsMap);
-                item.value = inspectionsMap[items[index].id].inspect_value
-                item.item_name = inspectionsMap[items[index].id].item_name
               }
-              // item["inspect_desc"] = inspectionsMap[items[index].id].inspect_desc
-              // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
               item.value_direction = ''
               if (item.range_type == 1) {
                 console.log('执行5',item.value);
@@ -1510,23 +1549,101 @@ export default {
                   item.value_direction = '↑'
                 }
               }
-              // if(this.org_id!=10503 && this.org_id!=0){
-              //   if(item.project_name!="" && item.item_name !=''){
-              //    this.items.push(item)
-              //   }
-              // }else{
-                this.items.push(item)
-              // }
-
+              
+              this.items.push(item)
               console.log('fffff',this.items);
               if(item.value.indexOf("http") !=-1){
-
                 this.isPic = true
               }
-
+              if(this.isPic == true){
+                for(let x in this.items){
+                  if(this.items[x].value ==''){
+                    this.items.splice(x,1)
+                  }
+                }
+              }
               console.log("woowwoow",this.isPic)
               console.log("isPicwowowow",this.items)
             }
+            // for (var index in items) {
+            //  console.log("obj",items[index].id)
+            //   // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
+            //   var item = {}
+            //   for (var key in items[index]) {
+            //     //  console.log("key",key,items[index][key])
+            //     // console.log("item[key]",items[index])
+            //     item[key] = items[index][key]
+            //   }
+
+            //   console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
+            //   if (item.item_id > 0) {
+            //     if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
+            //       if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
+            //         item.value = inspectionsMap[items[index].id].inspect_value
+            //         item.item_name = inspectionsMap[items[index].id].item_name
+            //       }else{
+            //         console.log('执行1',item.project_name,inspectionsMap[items[index].id]);
+
+            //         if(this.org_id == 10702 || this.org_id==0){
+            //           if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
+            //               item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
+            //               item.project_name == '传染病检查'
+            //             ){
+
+            //             item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+            //             item.item_name = inspectionsMap[items[index].id].item_name
+            //           }else{
+            //             item.value = ''
+            //             item.item_name = ''
+            //           }
+            //         } else{
+            //           console.log('执行2');
+            //           item.value = ''
+            //           item.item_name = ''
+            //         }
+            //       }
+            //     } else {
+            //       console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
+            //       item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+            //       item.item_name = inspectionsMap[items[index].item_id].item_name
+            //     }
+            //     if(this.org_id ==10191){
+            //       if(item.project_name == "乙肝定性（五项)"){
+            //         console.log("金阿迪发到付阿打发")
+            //         item.value = inspectionsMap[items[index].id].inspect_value
+            //         item.item_name = inspectionsMap[items[index].id].item_name
+            //       }
+            //     }
+            //   } else {
+            //     if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
+            //       continue
+            //     }
+            //     console.log('执行4',inspectionsMap);
+            //     item.value = inspectionsMap[items[index].id].inspect_value
+            //     item.item_name = inspectionsMap[items[index].id].item_name
+            //   }
+            //   // item["inspect_desc"] = inspectionsMap[items[index].id].inspect_desc
+            //   // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
+            //   item.value_direction = ''
+            //   if (item.range_type == 1) {
+            //     console.log('执行5',item.value);
+            //     var value = parseFloat(item.value)
+            //     var range_min = parseFloat(item.range_min)
+            //     var range_max = parseFloat(item.range_max)
+            //     if (value < range_min) {
+            //       item.value_direction = '↓'
+            //     } else if (value > range_max) {
+            //       item.value_direction = '↑'
+            //     }
+            //   }
+            //   this.items.push(item)
+            //   console.log('fffff',this.items);
+            //   if(item.value.indexOf("http") !=-1){
+            //     this.isPic = true
+            //   }
+            //   console.log("woowwoow",this.isPic)
+            //   console.log("isPicwowowow",this.items)
+            // }
           }
         })
         .catch(v => {