统计配置开发

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -214,8 +214,13 @@ export default {
      
     },
     changeOptions(val){
+     if(this.type == 2){
+        this.getMonthList()
+        return false
+      }
       this.lapseto = val
       this.getlist()
+       
     },
     getNormData(){
         getNormData().then(response=>{
@@ -226,12 +231,18 @@ export default {
             }
             this.normdata = normdata
             this.getlist()
-            this.getMonthList()
+           // this.getMonthList()
         })
     },
     handleModeType(val){
+       console.log("触发了额",this.type)
+       if(this.type == 2){
+        this.getMonthList()
+        return false
+      }
       this.mode_type = val
       this.getlist()
+     
     },
 
     //季度
@@ -421,6 +432,56 @@ export default {
         }
       //  console.log("resultTwo",result)
         return result;
+    },
+     arrayDateThree(array1,array2){
+        // console.log("array1",array1)
+        // console.log("array2",array2)
+        var array1 = array1;
+        var array2 = array2;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+       console.log("resultThree",result)
+        return result;
+    },
+    arrayDateFour(array1,array2){
+      //   console.log("array1",array1)
+      //   console.log("array2",array2)
+        var array1 = array1;
+        var array2 = array2;
+        var result = [];
+        for(var i = 0; i < array2.length; i++){
+            var obj = array2[i];
+            var num = obj.Total;   //staff_id   就是要对比的key
+            var isExist = false;
+            for(var j = 0; j < array1.length; j++){
+                var aj = array1[j];
+                var n = aj.Total;
+                if(n == num){
+                    isExist = true;
+                    break;
+             }
+            }
+            if(!isExist){
+                result.push(obj);
+            }
+        }
+      //  console.log("resultTwo",result)
+        return result;
     },
      compare(property){
        return function(a,b){
@@ -432,6 +493,8 @@ export default {
     
     //按月份统计
     getMonthList(){
+         this.modesData.series = []
+         this.modesData.xAxis = []
         const januaryStart = moment().month(0).startOf('month').format("YYYY-MM-DD")
         console.log("一月始",januaryStart)
         const januaryEnd = moment().month(0).endOf('month').format("YYYY-MM-DD")
@@ -521,11 +584,161 @@ export default {
           decStart:decStart,
           decEnd:decEnd,    
         }
-       console.log("params",params)
+       console.log("params222222",params)
        getMonthProjectList(params).then(response=>{
         if(response.data.state === 1){
             var monthlist = response.data.data.monthlist
-            console.log("monthlist",monthlist)
+            console.log("monthlist++++++",monthlist)
+            var newArr = [
+              {Total:"一月",Count:1,NoCount: 0},
+              {Total:"二月",Count:1,NoCount: 0},
+              {Total:"三月",Count:1,NoCount: 0},
+              {Total:"四月",Count:1,NoCount: 0},
+              {Total:"五月",Count:1,NoCount: 0},
+              {Total:"六月",Count:1,NoCount: 0},
+              {Total:"七月",Count:1,NoCount: 0},
+              {Total:"八月",Count:1,NoCount: 0},
+              {Total:"九月",Count:1,NoCount: 0},
+              {Total:"十月",Count:1,NoCount: 0},
+              {Total:"十一月",Count:1,NoCount: 0},
+              {Total:"十二月",Count:1,NoCount: 0},
+            ]
+
+            var newArrTwo = [
+              {Total:"一月",Count:0},
+              {Total:"二月",Count:0},
+              {Total:"三月",Count:0},
+              {Total:"四月",Count:0},
+              {Total:"五月",Count:0},
+              {Total:"六月",Count:0},
+              {Total:"七月",Count:0},
+              {Total:"八月",Count:0},
+              {Total:"九月",Count:0},
+              {Total:"十月",Count:0},
+              {Total:"十一月",Count:0},
+              {Total:"十二月",Count:0},
+            ]
+           
+             //获取2个数组不同的部分
+            var standArr = this.arrayDateThree(monthlist,newArr)  
+            console.log("standArr",standArr)
+            standArr.map(item=>{
+                monthlist.push(item)
+              }) 
+            
+
+             //排序
+             for(let i=0;i<monthlist.length;i++){
+                if(monthlist[i].Total == "一月"){
+                   monthlist[i].Total = 1
+                }
+                if(monthlist[i].Total == "二月"){
+                   monthlist[i].Total = 2
+                }
+                if(monthlist[i].Total == "三月"){
+                   monthlist[i].Total = 3
+                }
+                if(monthlist[i].Total == "四月"){
+                   monthlist[i].Total = 4
+                }
+                if(monthlist[i].Total == "五月"){
+                   monthlist[i].Total = 5
+                }
+                if(monthlist[i].Total == "六月"){
+                   monthlist[i].Total = 6
+                }
+                if(monthlist[i].Total == "七月"){
+                   monthlist[i].Total = 7
+                }
+                if(monthlist[i].Total == "八月"){
+                   monthlist[i].Total = 8
+                }
+                if(monthlist[i].Total == "九月"){
+                   monthlist[i].Total = 9
+                }
+                if(monthlist[i].Total == "十月"){
+                   monthlist[i].Total = 10
+                }
+                if(monthlist[i].Total == "十一月"){
+                   monthlist[i].Total = 11
+                }
+                 if(monthlist[i].Total == "十二月"){
+                   monthlist[i].Total = 12
+                }
+             }
+            
+              //排序
+             monthlist.sort(this.compare('Total'))
+             for(let i=0;i<monthlist.length;i++){
+                if(monthlist[i].Total == 1){
+                  monthlist[i].Total = "一月"
+                }
+                if(monthlist[i].Total == 2){
+                  monthlist[i].Total = "二月"
+                }
+                 if(monthlist[i].Total == 3){
+                  monthlist[i].Total = "三月"
+                }
+                 if(monthlist[i].Total == 4){
+                  monthlist[i].Total = "四月"
+                }
+                 if(monthlist[i].Total == 5){
+                  monthlist[i].Total = "五月"
+                }
+                 if(monthlist[i].Total == 6){
+                  monthlist[i].Total = "六月"
+                }
+                 if(monthlist[i].Total == 7){
+                  monthlist[i].Total = "七月"
+                }
+                 if(monthlist[i].Total == 8){
+                  monthlist[i].Total = "八月"
+                }
+                 if(monthlist[i].Total == 9){
+                  monthlist[i].Total = "九月"
+                }
+                 if(monthlist[i].Total == 10){
+                  monthlist[i].Total = "十月"
+                }
+                 if(monthlist[i].Total == 11){
+                  monthlist[i].Total = "十一月"
+                }
+                 if(monthlist[i].Total == 12){
+                  monthlist[i].Total = "十二月"
+                }
+             }
+              console.log("monthlist-------------------------",monthlist)
+             var monthNolist = response.data.data.monthNolist
+             console.log("monthNolist",monthNolist)
+             
+            var standArrTwo = this.arrayDateThree(monthNolist,newArrTwo)  
+             console.log("standArrTwo",standArrTwo)
+
+             standArrTwo.map(item=>{
+                monthNolist.push(item)
+              }) 
+
+
+
+             var arrOne = []
+             for(let i=0;i<monthlist.length;i++){
+               for(let j=0;j<monthNolist.length;j++){
+                 if(monthlist[i].Total == monthNolist[j].Total){
+                     monthlist[i].NoCount = monthNolist[j].Count
+                     arrOne.push(monthlist[i])
+                 }
+               }
+             }
+             console.log("arrOne",arrOne)
+              
+            for(const key in arrOne){
+              this.modesData.xAxis.push(arrOne[key].Total);
+              this.modesData.series.push(((arrOne[key].NoCount/arrOne[key].Count)*100).toFixed(1));
+            }
+          
+
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
            }
        })
     }

src/xt_pages/user/inspection.vue

@@ -178,11 +178,10 @@
               <el-date-picker
                 style="width:95%"
                 v-model="form.inspect_date"
-                type="date"
-                value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
                 placeholder="选择日期"
-                :readonly="form.method == 'add' ? false : true"
               >
               </el-date-picker>
             </el-form-item>
@@ -248,18 +247,18 @@
 </template>
 
 <script>
-import PatientSidebar from "./components/PatientSidebar";
+import PatientSidebar from './components/PatientSidebar'
 import {
   fetchInspectionReference,
   CreatePatientInspection,
   fetchPatientInspections,
   EditPatientInspection,
   DeletePatientInspection
-} from "@/api/inspection";
-import { uParseTime, isPositiveNumber } from "@/utils/tools";
+} from '@/api/inspection'
+import { uParseTime, isPositiveNumber } from '@/utils/tools'
 
 export default {
-  name: "Inspection",
+  name: 'Inspection',
   components: { PatientSidebar },
   data() {
     return {
@@ -267,22 +266,23 @@ export default {
       pageLoading: true,
       itemLoading: false,
       formLoading: false,
-      itemDate: "",
+      itemDate: '',
       patientID: 0,
-      panelClass: "patient-app-container",
+      panelClass: 'patient-app-container',
       patientInfo: {
         id: 0
       },
-      itemName: "请选择项目",
-      formTitle: "",
+      itemName: '请选择项目',
+      formTitle: '',
       dialogFormVisible: false,
       patient_info: null,
       form: {
-        remind_cycle: "",
-        method: "add",
+        remind_cycle: '',
+        method: 'add',
         project_id: 0,
-        inspect_date: "",
-        formItem: [{ id: 0, value: "" }]
+        inspect_date: '',
+        old_inspect_date: '',
+        formItem: [{ id: 0, value: '' }]
       },
       formItem: [],
       items: [],
@@ -295,112 +295,100 @@ export default {
         project_id: 0,
         page: 1
       }
-    };
+    }
   },
   methods: {
     deleteInspection() {
-      if (this.project == null || this.itemDate == "") {
-        this.$message.error("请先选择删除删除的记录");
-        return false;
+      if (this.project == null || this.itemDate == '') {
+        this.$message.error('请先选择删除删除的记录')
+        return false
       }
 
-      this.$confirm("确认删除此记录?", "删除", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除此记录?', '删除', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           var params = {
             patient: this.patientID,
             date: this.itemDate,
             project_id: this.project.project_id
-          };
+          }
           DeletePatientInspection(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (var index in this.projects) {
                 if (this.projects[index].project_id == params.project_id) {
-                  this.projects[index].count--;
-                  break;
+                  this.projects[index].count--
+                  break
                 }
               }
-              this.total -= 1;
-              this.itemDate = "";
-              this.items = [];
+              this.total -= 1
+              this.itemDate = ''
+              this.items = []
               if (this.total > 0) {
-                this.queryParams.page = 1;
-                this.fetchPatientInspections(this.queryParams);
+                this.queryParams.page = 1
+                this.fetchPatientInspections(this.queryParams)
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     openEdit() {
       if (this.project == null) {
-        this.$message.error("请先选择项目");
-        return false;
+        this.$message.error('请先选择项目')
+        return false
       }
 
-      this.form.method = "edit";
-      this.formTitle = "修改" + this.project.project_name;
-      this.form.project_id = this.project.project_id;
-      this.form.inspect_date = this.itemDate;
-      this.form.remind_cycle = this.patient_info.remind_cycle;
-      console.log(this.form.remind_cycle);
+      this.form.method = 'edit'
+      this.formTitle = '修改' + this.project.project_name
+      this.form.project_id = this.project.project_id
+      this.form.inspect_date = this.itemDate
+      this.form.old_inspect_date = this.itemDate
+      this.form.remind_cycle = this.patient_info.remind_cycle
+      console.log(this.form.remind_cycle)
 
-      this.form.formItem = [];
+      this.form.formItem = []
       for (var index in this.project.inspection_reference) {
         this.form.formItem.push({
-          id:
-            this.project.inspection_reference[index].id in this.inspectionsMap
-              ? this.inspectionsMap[this.project.inspection_reference[index].id]
-                  .id
-              : 0,
+          id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
           item_id: this.project.inspection_reference[index].id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value:
-            this.project.inspection_reference[index].id in this.inspectionsMap
-              ? this.inspectionsMap[this.project.inspection_reference[index].id]
-                  .inspect_value
-              : "",
-          select_options: this.project.inspection_reference[
-            index
-          ].range_options.split(","),
+          value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
+          select_options: this.project.inspection_reference[index].range_options.split(','),
           unit: this.project.inspection_reference[index].unit
-        });
+        })
       }
-
-      console.log(this.form.formItem);
-
-      this.dialogFormVisible = true;
+      console.log(this.form.formItem)
+      this.dialogFormVisible = true
     },
     openNew() {
       if (this.project == null) {
-        this.$message.error("请先选择项目");
-        return false;
+        this.$message.error('请先选择项目')
+        return false
       }
-      this.form.method = "add";
-      this.formTitle = "新增" + this.project.project_name;
-      this.form.project_id = this.project.project_id;
-      this.form.remind_cycle = this.patient_info.remind_cycle;
-
-      var today = new Date();
-      this.form.inspect_date = uParseTime(today, "{y}-{m}-{d}");
-      this.form.formItem = [];
+      this.form.method = 'add'
+      this.formTitle = '新增' + this.project.project_name
+      this.form.project_id = this.project.project_id
+      this.form.remind_cycle = this.patient_info.remind_cycle
+      var today = new Date()
+      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
+      this.form.formItem = []
       for (var index in this.project.inspection_reference) {
         // var formItem = this.project.inspection_reference[index];
         // formItem["value"] = '';
@@ -415,114 +403,106 @@ export default {
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value: "",
+          value: '',
           select_options: this.project.inspection_reference[
             index
-          ].range_options.split(","),
+          ].range_options.split(','),
           unit: this.project.inspection_reference[index].unit
-        });
+        })
       }
 
-      this.dialogFormVisible = true;
+      this.dialogFormVisible = true
     },
     submitEdit(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.formLoading = true;
+          this.formLoading = true
           if (this.form.formItem.length == 0) {
-            this.$message.error("未填写项目");
-            return false;
+            this.$message.error('未填写项目')
+            return false
           }
           for (var index in this.form.formItem) {
-            this.form.formItem[index].value =
-              "" + this.form.formItem[index].value;
+            this.form.formItem[index].value = '' + this.form.formItem[index].value
           }
 
-          EditPatientInspection(
-            this.patientID,
-            this.form,
-            this.form.remind_cycle,
-            this.form.inspect_date,
-            this.form.project_id
-          )
-            .then(response => {
-              if (response.data.state == 1) {
-                this.$notify({
-                  title: "成功",
-                  message: "修改成功",
-                  type: "success",
-                  duration: 2000
-                });
-                this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle;
-                this.itemDate = this.form.inspect_date;
-                this.items = [];
-                var inspections = response.data.data.inspections;
-                this.inspections = response.data.data.inspections;
-                if (inspections == null) {
-                  this.inspections = [];
-                  return false;
-                }
-                var inspectionsMap = {};
-                this.inspectionsMap = {};
-                for (var index in inspections) {
-                  inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
-                  this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
-                }
-                var items = this.project.inspection_reference;
-                for (var index in items) {
-                  if (items[index].id in inspectionsMap) {
-                    var item = {};
-                    for (var key in items[index]) {
-                      item[key] = items[index][key];
-                    }
-                    item.value = inspectionsMap[items[index].id].inspect_value;
-                    item.value_direction = "";
-                    if (item.range_type == 1) {
-                      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 = "↑";
-                      }
+          EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
+            if (response.data.state == 1) {
+              this.$notify({
+                title: '成功',
+                message: '修改成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.patient_info.remind_cycle =
+                  response.data.data.remind_cycle
+              this.itemDate = this.form.inspect_date
+              this.items = []
+              var inspections = response.data.data.inspections
+              this.inspections = response.data.data.inspections
+              if (inspections == null) {
+                this.inspections = []
+                return false
+              }
+              var inspectionsMap = {}
+              this.inspectionsMap = {}
+              for (var index in inspections) {
+                inspectionsMap[inspections[index].item_id] =
+                    inspections[index]
+                this.inspectionsMap[inspections[index].item_id] =
+                    inspections[index]
+              }
+              var items = this.project.inspection_reference
+              for (var index in items) {
+                if (items[index].id in inspectionsMap) {
+                  var item = {}
+                  for (var key in items[index]) {
+                    item[key] = items[index][key]
+                  }
+                  item.value = inspectionsMap[items[index].id].inspect_value
+                  item.value_direction = ''
+                  if (item.range_type == 1) {
+                    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);
                   }
+                  this.items.push(item)
                 }
-
-                this.resetForm(formName);
-                this.dialogFormVisible = false;
-              } else {
-                this.$message.error(response.data.msg);
-                return false;
               }
-            })
+
+              this.resetForm(formName)
+              this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.data.msg)
+              return false
+            }
+          })
             .catch(v => {
-              this.$message.error(v);
-              return false;
-            });
-          this.formLoading = false;
-          return false;
+              this.$message.error(v)
+              return false
+            })
+          this.formLoading = false
+          return false
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     submitNew(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          this.formLoading = true;
+          this.formLoading = true
           if (this.form.formItem.length == 0) {
-            this.$message.error("未填写项目");
-            return false;
+            this.$message.error('未填写项目')
+            return false
           }
           for (var index in this.form.formItem) {
             this.form.formItem[index].value =
-              "" + this.form.formItem[index].value;
+              '' + this.form.formItem[index].value
           }
           CreatePatientInspection(
             this.patientID,
@@ -532,239 +512,207 @@ export default {
             .then(response => {
               if (response.data.state == 1) {
                 this.$notify({
-                  title: "成功",
-                  message: "新增成功",
-                  type: "success",
+                  title: '成功',
+                  message: '新增成功',
+                  type: 'success',
                   duration: 2000
-                });
+                })
                 // this.form.remind_reycle = response.data.data.remind_reycc
                 this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle;
-                console.log(this.patient_info.remind_cycle);
+                  response.data.data.remind_cycle
+                console.log(this.patient_info.remind_cycle)
 
-                this.itemDate = this.form.inspect_date;
-                console.log(this.itemDate);
-
-                this.items = [];
+                this.itemDate = this.form.inspect_date
+                this.items = []
                 for (var index in this.projects) {
                   if (this.projects[index].project_id == this.form.project_id) {
-                    this.projects[index].count++;
-                    break;
+                    this.projects[index].count++
+                    break
                   }
                 }
-                this.total += 1;
-                var inspections = response.data.data.inspections;
-                this.inspections = response.data.data.inspections;
+                this.total += 1
+                var inspections = response.data.data.inspections
+                this.inspections = response.data.data.inspections
                 if (inspections == null) {
-                  this.inspections = [];
-                  return false;
+                  this.inspections = []
+                  return false
                 }
-                var inspectionsMap = {};
-                this.inspectionsMap = {};
+                var inspectionsMap = {}
+                this.inspectionsMap = {}
                 for (var index in inspections) {
                   inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
+                    inspections[index]
                   this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
+                    inspections[index]
                 }
-                var items = this.project.inspection_reference;
+                var items = this.project.inspection_reference
                 for (var index in items) {
                   if (items[index].id in inspectionsMap) {
-                    var item = {};
+                    var item = {}
                     for (var key in items[index]) {
-                      item[key] = items[index][key];
+                      item[key] = items[index][key]
                     }
-                    item.value = inspectionsMap[items[index].id].inspect_value;
-                    item.value_direction = "";
+                    item.value = inspectionsMap[items[index].id].inspect_value
+                    item.value_direction = ''
                     if (item.range_type == 1) {
-                      var value = parseFloat(item.value);
-                      var range_min = parseFloat(item.range_min);
-                      var range_max = parseFloat(item.range_max);
+                      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 = "↓";
+                        item.value_direction = '↓'
                       } else if (value > range_max) {
-                        item.value_direction = "↑";
+                        item.value_direction = '↑'
                       }
                     }
-                    this.items.push(item);
+                    this.items.push(item)
                   }
                 }
 
-                this.resetForm(formName);
-                this.dialogFormVisible = false;
+                this.resetForm(formName)
+                this.dialogFormVisible = false
 
-                this.queryParams.patient = this.patientID;
-                this.queryParams.project_id = this.project.project_id;
-                this.queryParams.page = 1;
-                this.total = 0;
-                this.fetchPatientInspections(this.queryParams);
+                this.queryParams.patient = this.patientID
+                this.queryParams.project_id = this.project.project_id
+                this.queryParams.page = 1
+                this.total = 0
+                this.fetchPatientInspections(this.queryParams)
               } else {
-                this.$message.error(response.data.msg);
-                return false;
+                this.$message.error(response.data.msg)
+                return false
               }
             })
             .catch(v => {
-              this.$message.error(v);
-              return false;
-            });
-          this.formLoading = false;
-          return false;
+              this.$message.error(v)
+              return false
+            })
+          this.formLoading = false
+          return false
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
     fetchInspectionReference() {
       fetchInspectionReference(this.patientID)
         .then(response => {
           if (response.data.state == 1) {
-            var reference = response.data.data.reference;
-            console.log("reference",reference)
-            var patient_info = response.data.data.patient_info;
-            this.projects = reference;
-            this.patient_info = patient_info;
-            this.pageLoading = false;
-            this.form.remind_cycle = this.patient_info.remind_cycle;
+            var reference = response.data.data.reference
+            var patient_info = response.data.data.patient_info
+            this.projects = reference
+            this.patient_info = patient_info
+            this.pageLoading = false
+            this.form.remind_cycle = this.patient_info.remind_cycle
           } else {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           }
         })
-        .catch(v => {});
+        .catch(v => {})
     },
     setCurrent(row) {
-      this.$refs.singleTable.setCurrentRow(row);
+      this.$refs.singleTable.setCurrentRow(row)
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields();
+      this.$refs[formName].resetFields()
     },
     handleCurrentChange(row) {
-      this.itemDate = "";
-      this.form.method = "add";
-      if (typeof row === "undefined" || row == null) {
-        this.project = null;
-        this.items = [];
-        this.itemName = "请选择项目";
+      this.itemDate = ''
+      this.form.method = 'add'
+      if (typeof row === 'undefined' || row == null) {
+        this.project = null
+        this.items = []
+        this.itemName = '请选择项目'
       } else {
-        this.itemLoading = true;
-        this.project = row;
-        this.items = row.inspection_reference;
-        this.itemName = row.project_name;
-
-        this.queryParams.patient = this.patientID;
-        this.queryParams.project_id = this.project.project_id;
-        this.queryParams.page = 1;
-        this.total = 0;
-        this.fetchPatientInspections(this.queryParams);
+        this.itemLoading = true
+        this.project = row
+        this.items = row.inspection_reference
+        this.itemName = row.project_name
+
+        this.queryParams.patient = this.patientID
+        this.queryParams.project_id = this.project.project_id
+        this.queryParams.page = 1
+        this.total = 0
+        this.fetchPatientInspections(this.queryParams)
       }
     },
 
     handleCurrentChangePage(val) {
-      this.itemLoading = true;
-      this.queryParams.page = val;
-      this.fetchPatientInspections(this.queryParams);
+      this.itemLoading = true
+      this.queryParams.page = val
+      this.fetchPatientInspections(this.queryParams)
     },
     fetchPatientInspections(params) {
-      this.items = [];
+      this.items = []
       fetchPatientInspections(params)
         .then(response => {
           if (response.data.state == 1) {
-            var inspections = response.data.data.inspections;
-            console.log("inspections",inspection)
-            this.total = response.data.data.total;
-            this.itemDate = response.data.data.date.split(" ")[0];
-            this.inspections = response.data.data.inspections;
+            var inspections = response.data.data.inspections
+            this.total = response.data.data.total
+            this.itemDate = response.data.data.date
+            this.inspections = response.data.data.inspections
             if (inspections == null) {
-              this.inspections = [];
-              return false;
+              this.inspections = []
+              return false
             }
-            var inspectionsMap = {};
-            this.inspectionsMap = {};
+            var inspectionsMap = {}
+            this.inspectionsMap = {}
             for (var index in inspections) {
-              console.log(inspections[index])
-              inspectionsMap[inspections[index].item_id] = inspections[index];
-
-              this.inspectionsMap[inspections[index].item_id] =
-                inspections[index];
+              inspectionsMap[inspections[index].item_id] = inspections[index]
+              this.inspectionsMap[inspections[index].item_id] = inspections[index]
             }
-            var items = this.project.inspection_reference;
-
-            console.log(items)
-            console.log(inspectionsMap)
-
-
-
+            var items = this.project.inspection_reference
             for (var index in items) {
-
-              if (
-                items[index].id in inspectionsMap ||
-                items[index].item_id in inspectionsMap
-              ) {
-
-
-                var item = {};
+              if (items[index].id in inspectionsMap || items[index].item_id in inspectionsMap) {
+                var item = {}
                 for (var key in items[index]) {
-                  item[key] = items[index][key];
+                  item[key] = items[index][key]
                 }
-                console.log(item.item_id);
-
                 if (item.item_id > 0) {
-                  console.log(item)
-                  console.log(items[index].item_id)
-                  console.log(inspectionsMap)
-
-                  console.log(inspectionsMap[parseInt(items[index].item_id)].inspect_value)
-
-                  item.value =
-                    inspectionsMap[items[index].item_id].inspect_value;
-
-
+                  if (inspectionsMap[items[index].item_id] == undefined) {
+                    item.value = inspectionsMap[items[index].id].inspect_value
+                  } else {
+                    item.value = inspectionsMap[items[index].item_id].inspect_value
+                  }
                 } else {
-
-                  item.value = inspectionsMap[items[index].id].inspect_value;
+                  item.value = inspectionsMap[items[index].id].inspect_value
                 }
-
-                item.value_direction = "";
+                item.value_direction = ''
                 if (item.range_type == 1) {
-
-                  var value = parseFloat(item.value);
-                  var range_min = parseFloat(item.range_min);
-                  var range_max = parseFloat(item.range_max);
+                  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 = "↓";
+                    item.value_direction = '↓'
                   } else if (value > range_max) {
-                    item.value_direction = "↑";
+                    item.value_direction = '↑'
                   }
                 }
-                this.items.push(item);
-
+                this.items.push(item)
               }
-
             }
-
-
+            console.log(this.items)
           }
         })
-        .catch(v => {});
+        .catch(v => {})
       setTimeout(() => {
-        this.itemLoading = false;
-      }, 1000);
+        this.itemLoading = false
+      }, 1000)
     }
   },
   created() {
-    const id = this.$route.query && this.$route.query.id;
-    this.patientID = parseInt(id);
+    const id = this.$route.query && this.$route.query.id
+    this.patientID = parseInt(id)
     if (isNaN(this.patientID) || this.patientID <= 0) {
       this.$notify.error({
-        title: "错误",
-        message: "无效的id"
-      });
-      this.$router.push("/patients/patients");
+        title: '错误',
+        message: '无效的id'
+      })
+      this.$router.push('/patients/patients')
     }
 
-    this.fetchInspectionReference();
+    this.fetchInspectionReference()
   }
-};
+}
 </script>
 
 <style>