Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13755"
+  "version": "2999.999.13757"
 }

src/pages/main/today/TodayTab.vue

@@ -1671,6 +1671,13 @@ export default {
 
           console.log("项目姐夫------------------------",this.project)
 
+          console.log("项目开关-----------------",this.is_project_open)
+
+          //针对濉溪杏康
+          if(this.$store.getters.user.template_info.org_id == 10721){
+            this.is_project_open = 2
+          }
+
           if (this.project != null && this.is_project_open == 1) {
             this.project.map(item => {
               let obj = {
@@ -2318,6 +2325,8 @@ export default {
             }
             var his_doctor_advices = resp.data.his_advices
 
+
+
             this.his_is_open = resp.data.is_open_config.is_open
 
             var is_advice_open = resp.data.is_advice_open.is_advice_open
@@ -2344,19 +2353,48 @@ export default {
                 doctor_advices[i]['origin'] = 1
               }
             }
+            // if (his_doctor_advices != null) {
+            //   for (let i = 0; i < his_doctor_advices.length; i++) {
+            //     his_doctor_advices[i]['origin'] = 2
+            //     his_doctor_advices[i]['way'] = 1
+            //     if (doctor_advices != null) {
+            //       doctor_advices.push(his_doctor_advices[i])
+            //     }
+            //     if (doctor_advices == null) {
+            //       doctor_advices = []
+            //       doctor_advices.push(his_doctor_advices[i])
+            //     }
+            //   }
+            // }
             if (his_doctor_advices != null) {
-              for (let i = 0; i < his_doctor_advices.length; i++) {
-                his_doctor_advices[i]['origin'] = 2
-                his_doctor_advices[i]['way'] = 1
-                if (doctor_advices != null) {
+            for (let i = 0; i < his_doctor_advices.length; i++) {
+              his_doctor_advices[i]['origin'] = 2
+              his_doctor_advices[i]['way'] = 1
+              if (doctor_advices != null) {
+
+                //针对 濉溪杏康血液透析中心
+                if(this.$store.getters.user.template_info.org_id == 10721){
+                  if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1 && his_doctor_advices[i].advice_name.indexOf("胰岛素")==-1){
+                    doctor_advices.push(his_doctor_advices[i])
+                  }
+                }else{
                   doctor_advices.push(his_doctor_advices[i])
                 }
-                if (doctor_advices == null) {
+
+
+              } else {
                   doctor_advices = []
-                  doctor_advices.push(his_doctor_advices[i])
-                }
+                  //针对 濉溪杏康血液透析中心
+                  if(this.$store.getters.user.template_info.org_id == 10721){
+                    if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1 && his_doctor_advices[i].advice_name.indexOf("胰岛素")==-1){
+                      doctor_advices.push(his_doctor_advices[i])
+                    }
+                  }else{
+                       doctor_advices.push(his_doctor_advices[i])
+                  }
               }
             }
+          }
             var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
             var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
             var last_monitor_record = resp.data.last_monitor_record
@@ -2467,11 +2505,24 @@ export default {
               }
             }
 
+
+            this.is_project_open = resp.data.is_project_open_config.is_open
+
+            console.log("第二项目姐夫------------------------",this.project)
+
+            console.log("第二项目开关-----------------",this.is_project_open)
+
+          //针对濉溪杏康
+          if(this.$store.getters.user.template_info.org_id == 10721){
+            this.is_project_open = 2
+          }
+
+          if (this.project != null && this.is_project_open == 1) {
             this.project.map(item => {
               let obj = {
                 advice_doctor: item.doctor,
                 start_time: item.start_time,
-                advice_name: item.type == 2 ? item.project.project_name : item.good_info.good_name,
+                advice_name: item.team_id > 0 && item.is_check_team == 1 ? item.team.project_team : item.type == 2 ? item.project.project_name + ' ' + item.count + item.project.unit : item.good_info.good_name + ' ' + item.good_info.specification_name + ' ' + item.count + item.good_info.packing_unit,
                 execution_time: item.execution_time,
                 execution_state: item.execution_state,
                 execution_staff: item.execution_staff,
@@ -2481,7 +2532,9 @@ export default {
                 remark: '',
                 id: item.id,
                 parent_id: 0,
-                projectType: 2
+                projectType: 2,
+                team_id: item.team_id,
+                is_check_team: item.is_check_team
               }
               let advice = []
               advice.push(obj)
@@ -2491,6 +2544,32 @@ export default {
               }
               this.advice_groups.push(advices)
             })
+          }
+
+            // this.project.map(item => {
+            //   let obj = {
+            //     advice_doctor: item.doctor,
+            //     start_time: item.start_time,
+            //     advice_name: item.type == 2 ? item.project.project_name : item.good_info.good_name,
+            //     execution_time: item.execution_time,
+            //     execution_state: item.execution_state,
+            //     execution_staff: item.execution_staff,
+            //     check_time: item.check_time,
+            //     check_state: item.check_state,
+            //     checker: item.checker,
+            //     remark: '',
+            //     id: item.id,
+            //     parent_id: 0,
+            //     projectType: 2
+            //   }
+            //   let advice = []
+            //   advice.push(obj)
+            //   let advices = {
+            //     advices: advice,
+            //     group_no: 0
+            //   }
+            //   this.advice_groups.push(advices)
+            // })
 
             let doctorAdviceArr = []
             this.doctor_advices.map(item => {