Merge branch 'vue_statistics_branch' of http://git.shengws.com/csx/Vue_New into vue_statistics_branch

src/api/common/common.js

 }
 
 export function getDialysisList(startime, endtime, page, limit) {
-  console.log('startime', startime)
-  console.log('endtime', endtime)
   const params = {
     startime: startime,
     endtime: endtime,
     params: params
   })
 }
+
+export function getLastSort(params) {
+  return request({
+    url: '/com/api/getlastsort',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getLastCheckList(params) {
+  return request({
+    url: '/com/api/getlastchecklist',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/qcd/checkStatistical.vue

 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import {getAllInspectionData,SaveCheckConfiguration,getAllCheckList,getCheckDetail,UpdateCheck,DeleteCheck} from "@/api/common/common"
+import {getAllInspectionData,SaveCheckConfiguration,getAllCheckList,getCheckDetail,UpdateCheck,DeleteCheck,getLastCheckList} from "@/api/common/common"
 export default {
   name: "dialysisTotal",
   data() {
   created() {
     //获取大项
     this.getAllInspectionData(),
-    this.getAllCheckList()
+    this.getAllCheckList(),
+    //获取排序
+    this.getLastCheckList()
   },
   methods: {
     handleTabClick(tab, event) {
        getCheckDetail(id).then(response=>{
          if(response.data.state == 1){
            var checkdetail = response.data.data.checkdetail
-           console.log("checkdetail",checkdetail)
+          // console.log("checkdetail",checkdetail)
            this.editform.id = checkdetail.id
            this.editform.inspectionMajor = checkdetail.inspection_major
            this.editform.frequency = checkdetail.inspection_frequency
                 this.form.inspectionMajor = ""
                 this.form.frequency = ""
                 this.form.sort = ""
+                this.getAllCheckList()
+                this.getLastCheckList()
               }else{
                 this.$message.error("检验检查项已存在,不能重复添加")
               }
+              
            })
          }
        })
               checklist[i].sort = ""
             }
           }
-          console.log("列表",checklist)
+         // console.log("列表",checklist)
           this.checkList = checklist
           this.total = response.data.data.total
-          console.log("total",this.total)
+          //console.log("total",this.total)
         }
       })
     },
         DeleteCheck(id,index).then(response => {
           if (response.data.state === 1) {
            var msg =  response.data.data.msg
-           console.log("msg",msg)
+           //console.log("msg",msg)
            this.checkList.splice(index,1)
           }
         });
       });
+    },
+    getLastCheckList(){
+      getLastCheckList().then(response=>{
+         if(response.data.state === 1){
+          var checklist =  response.data.data.checkList
+          this.form.sort = checklist.sort+1+""
+         }
+      })
     }
   },
   components: {

src/xt_pages/qcd/statisticalConfiguration.vue

 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList,getConfigurationDetail,getAllInspectionMinor,UpdateConfiguration,DeleteConfiguration }from "@/api/common/common";
+import { getInspectionMajor,getInspectionMinor,getInspectionRange,saveConfiguration,getConfigurationList,getConfigurationDetail,getAllInspectionMinor,UpdateConfiguration,DeleteConfiguration,getLastSort }from "@/api/common/common";
 export default {
   name: "dialysisTotal",
   data() {
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
            var configurationdetail = response.data.data.configurationdetail
-           console.log("详情",configurationdetail)
+          // console.log("详情",configurationdetail)
            this.editform.id = configurationdetail.id
            this.editform.inspectionMajor = configurationdetail.inspection_major
            this.editform.inspectionMinor = configurationdetail.inspection_minor
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-          console.log("大项",inspection)
+          //console.log("大项",inspection)
           this.InspectionMajor = inspection
          
         }
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-         console.log("小项",inspection)
+        // console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
        getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-         console.log("小项",inspection)
+        // console.log("小项",inspection)
          this.InspectionMinorTwo = inspection
         }
       })
        getInspectionRange(id).then(response=>{
          if(response.data.state == 1){
            var inspectionRange =  response.data.data.inspectionRange
-           console.log("inspectionRange",inspectionRange)
+          // console.log("inspectionRange",inspectionRange)
            this.form.min_range = inspectionRange.range_min
            this.form.large_range = inspectionRange.range_max
          }
       })
     },
     saveInspection(formName){
+      
       this.$refs[formName].validate(valid=>{
         if(valid){
           saveConfiguration(this.form).then(response=>{
              this.form.min_range = ""
              this.form.sort = ""
              this.getConfigurationList()
+             this.getLastSort()
             }else{
              this.$message.error("检查小项已存在")
             }
               configurationlist[i].sort = ""
             }
           }
-          console.log("列表",configurationlist)
+          //console.log("列表",configurationlist)
           this.configuraData = configurationlist
           var total = response.data.data.total
-          console.log("total",total)
+         // console.log("total",total)
           this.total = total
         }
       })
         if(response.data.state == 1){
           var minor =  response.data.data.minor
           this.InspectionMinorTwo = minor
-          console.log("minor",minor)
+          //console.log("minor",minor)
         }
       })
     },
       UpdateConfiguration(this.editform.id,this.editform).then(response=>{
         if(response.data.state == 1){
          var standard =  response.data.data.standard
-         console.log("standard",standard)
+        // console.log("standard",standard)
          this.$message.success("保存成功")
          this.editDialog = false
          this.getConfigurationList()
         DeleteConfiguration(id,index).then(response => {
           if (response.data.state === 1) {
            var msg =  response.data.data.msg
-           console.log("msg",msg)
+          // console.log("msg",msg)
            this.configuraData.splice(index,1)
           }
         });
       });
     },
+    getLastSort(){
+      getLastSort().then(response=>{
+        if(response.data.state === 1){
+          var standard = response.data.data.standard
+         // console.log("standard",standard)
+          this.form.sort = standard.sort + 1+''
+        }
+      })
+    },
   },
   components: {
     PieChart,
     this.getConfigurationList()
     //获取所有小项的数据
     this.getAllInspectionMinor()
+    //获取排序值
+    this.getLastSort()
    },
 
 };

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

           <el-table-column fixed prop="name" label="姓名" width="140">
             <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
           </el-table-column>
-          <el-table-column prop="age" label="年龄" width="140">
-             <!-- <template slot-scope="scope">{{ scope.row.id_card_no }}</template> -->
+          <el-table-column  label="年龄" width="140">
+             <template slot-scope="scope">{{ getAge(scope.row.id_card_no) }}</template>
           </el-table-column>
           <el-table-column prop="dialysis_no" label="透析号" width="140">
               <!-- <template slot-scope="scope">{{ scope.row.dialysis_no }}</template> -->
           </el-table-column>
           <el-table-column prop="mode_id" label="透析模式">
               <template slot-scope="scope">
-                <span>{{ scope.row.mode_id.join("、") }}</span>
+                <!--<span>{{ scope.row.mode_id.join("、") }}</span>-->
+                <span>{{scope.row.patient_id}}</span>
               </template>
            </el-table-column>
-          <el-table-column prop="address" label="透析总次数" width="140"></el-table-column>
+          <el-table-column prop="address" label="透析总次数" width="140">
+            <template slot-scope="scope">
+                <span>{{ scope.row.total_dialysis + scope.row.user_sys_before_count }}</span>
+              </template>
+          </el-table-column>
         </el-table>
 
         <el-pagination
       tableData: [],
       DialysisData: [],
       patientsData:[],
+      prescriptionList:[],
     };
   },
   methods: {
               if(dialysislist[i].mode_id == 13){
                 dialysislist[i].mode_id = "CRRT"
               }
-                if(dialysislist[i].mode_id == 14){
+             if(dialysislist[i].mode_id == 14){
                 dialysislist[i].mode_id = "腹水回输"
               }
               if(dialysislist[i].mode_id == 19){
                 patient_id: patient_id,
                 dialysis_no: item.dialysis_no,
                 name:item.name,
-                age:item.id_card_no
+                age:item.id_card_no,
+                total_dialysis:item.total_dialysis,
+                user_sys_before_count:item.user_sys_before_count,
             })
            });
            res.map(item => {
              item.age = this.getAge(item.age)
            })
            console.log(res)
-           this.DialysisData = res
+           //this.DialysisData = res
  
             var total = response.data.data.total
-            console.log("total",total)
-            this.total = total
+            console.log("total",total) 
+           // this.total = total
+            
+            var list = response.data.data.list
+             for(let i=0;i<list.length;i++){
+              if(list[i].mode_id == 1){
+                list[i].mode_id = "HD"
+              }
+               if(list[i].mode_id == 2){
+                list[i].mode_id = "HDF"
+              }
+               if(list[i].mode_id == 3){
+                list[i].mode_id = "HD+HP"
+              }
+               if(list[i].mode_id == 4){
+                list[i].mode_id = "HP"
+              }
+               if(list[i].mode_id == 5){
+                list[i].mode_id = "HF"
+              }
+               if(list[i].mode_id == 6){
+                list[i].mode_id = "SCUF"
+              }
+               if(list[i].mode_id == 7){
+                list[i].mode_id = "IUF"
+              }
+               if(list[i].mode_id == 8){
+                list[i].mode_id = "HFHD"
+              }
+               if(list[i].mode_id == 9){
+                list[i].mode_id = "HFHD+HP"
+              }
+               if(list[i].mode_id == 10){
+                list[i].mode_id = "PHF"
+              }
+               if(list[i].mode_id == 11){
+                list[i].mode_id = "HFR"
+              }
+              if(list[i].mode_id == 12){
+                list[i].mode_id = "HDF+HP"
+              }
+              if(list[i].mode_id == 13){
+                list[i].mode_id = "CRRT"
+              }
+             if(list[i].mode_id == 14){
+                list[i].mode_id = "腹水回输"
+              }
+              if(list[i].mode_id == 19){
+                list[i].mode_id = "IUF+HD"
+              }
+           }
+            console.log("list",list)
+            
+            var totallist  =  response.data.data.totallist
+             console.log("totallist",totallist)
+            this.total = totallist  
+            var prescriptionList = response.data.data.prescriptionList
+            
+            console.log("prescriptionList",prescriptionList)
+            for(let i=0;i<this.prescriptionList.length;i++){
+             for(let j=0;j<list.length;j++){
+               if(this.prescriptionList[i].patient_id == list[j].patient_id){
+                  arr.push(this.prescriptionList[i])
+               }
+             }
+            }
+             let dataInfo = {}
+              list.forEach((item, index) => {
+                let { patient_id } = item
+                if (!dataInfo[patient_id]) {
+                  dataInfo[patient_id] = {
+                    patient_id,
+                    name:item.name,
+                    id_card_no:item.id_card_no,
+                    dialysis_no:item.dialysis_no,
+                    total_dialysis:item.total_dialysis,
+                    user_sys_before_count:item.user_sys_before_count,
+                    child: []
+                  }
+                }
+              })
+             let list = Object.values(dataInfo)
+            console.log("arr",list)    
+            list.map(item => {
+              for (let i = 0; i < prescriptionList.length; i++) {
+                if (
+                  item.patient_id === prescriptionList[i].patient_id
+                ) {
+                  item.child.push(prescriptionList[i])
+                }
+              }
+            })
+            console.log("list---",list)
+            this.DialysisData = list
          }
       })
     },
 				return age;
 			}
     },
-    onSearch(){}
+    onSearch(){},
+    unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.mode_id) && res.set(arr.mode_id, 1));
+      },
   },
   created(){
     var nowDate = new Date();

src/xt_pages/user/patients.vue

 
       },
       getCount(row) {
-        console.log(row)
+        
         return row.total_dialysis + row.user_sys_before_count
       },
       EditLapseto() {
             return false
           } else {
             this.tableData = response.data.data.patients
-            // console.log('病人是', this.tableData)
+             console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           }