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

src/router/modules/qcd.js

@@ -7,7 +7,7 @@ export default {
   name: "qcd",
   alwaysShow: true,
   meta: {
-    title: "科室质控",
+    title: "质控管理",
     icon: "statistics"
   },
   children: [
@@ -244,7 +244,7 @@ export default {
       component: () => import("@/xt_pages/qcd/workAnalysis/doctor"),
       name: "workAnalysisDoctor",
       meta: {
-        title: "工作量分析统计医生",
+        title: "工作量分析统计",
         noCache: true
       }
     },

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -32,7 +32,7 @@
                     血液净化治疗记录单
                     </div>
                 </div>
-                <div class="row">
+                <div class="row" style="display:flex;justify-content: space-between;">
                     <div class="inline_block" style="margin-right:30px;">
                         日期 <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{y}") }}</div>年
                         <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{m}") }}</div>月
@@ -41,7 +41,8 @@
                     <div class="inline_block" style="margin-right:30px;">
                         机器编号 
                         <div class="inline_block under_line" style="width:80px;">
-                        {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }}
+                          {{ record.device_zone.name && record.device_number.number ? getNewNumber(record.device_zone.name,record.device_number.number) : '' }}
+                        <!-- {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }} -->
                         </div>
                     </div>
                     <div class="inline_block" style="margin-right:30px;">
@@ -64,7 +65,7 @@
                     <div class="inline_block" style="margin-right:30px;">
                         年龄：
                         <div class="under_line" style="width: 50px;text-align: center">
-                            {{ getAge(record.patient) }}
+                            {{ getNewAge(record.patient.id_card_no) }}
                         </div>
                         岁
                     </div>
@@ -112,7 +113,7 @@
                     抗凝药物 
                     <div class="inline_block under_line" style="width:93%;text-align: left;">
                     <label-box :isChecked="record.prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>&nbsp;
-                    <label-box :isChecked="record.prescription.anticoagulant == 6 ? true : record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
+                    <label-box :isChecked="record.prescription.anticoagulant == 3 ?  true : record.prescription.anticoagulant == 6 ? true : record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
                     （<label-box :isChecked="record.prescription.anticoagulant == 6 ? true : false" showValue="钙"></label-box>
                         <label-box :isChecked="record.prescription.anticoagulant == 7 ? true : false" showValue="钠"></label-box>）
                     <div class="inline_block">
@@ -336,7 +337,7 @@
                         <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                         <td>&nbsp;
                             <span v-if="monitor.operate_time">
-                                {{ record.assessment_before_dislysis.dialysate_flow ? record.assessment_before_dislysis.dialysate_flow : "" }}
+                                {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }}
                             </span>
                         </td>
                         <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
@@ -720,8 +721,34 @@ export default {
       });
   },
   methods: {
+    getNewNumber(name,number){
+      if(name.indexOf("区") > -1){
+          return (
+            name + number
+          );
+        } else {
+          return (
+            name + "区" + number
+            
+          );
+        }
+    },
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        //获取年龄
+        var myDate = new Date();
+        var month = myDate.getMonth() + 1;
+        var day = myDate.getDate();
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+        age++;
+        }
+        return age;
+      }
+    },
     getIsCheckDataConfig(pName, cName, targetName){
         var arr = getDataConfig(pName,cName)
+        console.log(arr)
         for (let i = 0; i < arr.length; i++){
             if (arr[i].name == targetName){
             return arr[i].id

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

@@ -66,7 +66,7 @@
           :key="index"
         >
           <template slot-scope="scope">
-              {{ scope.row.data[1].Count}}
+              {{ scope.row.data[index].Count}}
           </template>
         </el-table-column>
         </el-table>
@@ -109,6 +109,9 @@ export default {
     };
   },
   methods: {
+    handleDelete(index, row) {
+        console.log(index, row);
+      },
     changeTime(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
       if (time > 0) {
@@ -122,7 +125,6 @@ export default {
       SearchDetailCheck(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
            var  checkDetail =  response.data.data.checkDetail
-           console.log("checkDetail",checkDetail)
              var arr = []
             for(let i=0;i<checkDetail.length;i++){
               for(let j=0;j<this.tableName.length;j++){
@@ -168,14 +170,15 @@ export default {
         if(response.data.state === 1){
            var inspection = response.data.data.inspection
            console.log("inspection",inspection)
-           var a=[1];
+           var a=[];
            for(let i=0;i<inspection.length;i++){
              a.push(inspection[i])
            }
            console.log("a",a)
+           this.newArr = a
            var arr = this.arrayToObj(a)
-
-           console.log("arrtwo",arr)
+           
+           console.log("arr",arr)
            this.ObjectData = arr
            this.tableName = inspection
         }
@@ -240,44 +243,50 @@ export default {
 
 
           var list = response.data.data.list
-           console.log("list",list)
-            var dtd = []
-            for(let i=0;i<list.length;i++){
-                for(let j=0;j<this.tableName.length;j++){
-                    if(list[i].ProjectId == this.tableName[j].inspection_major){
-                      dtd.push(list[i])
-                    }
-                }
-            }
-           console.log("dtd",dtd)
+          console.log("list",list)
+          var dtd = []
+          for(let i=0;i<list.length;i++){
+              for(let j=0;j<this.tableName.length;j++){
+                  if(list[i].ProjectId == this.tableName[j].inspection_major){
+                    dtd.push(list[i])
+                  }
+              }
+          }
+          console.log("dtd",dtd)
           var dd = {};
            for (const index in dtd) {
             if (!(dtd[index].name in dd)) {
                dd[dtd[index].name] = {};
             }
             if (!(dtd[index].ProjectId in dd[dtd[index].name]) && dtd[index].ProjectId != 0) {
-              dd[dtd[index].name][dtd[index].ProjectId] = dtd[index];
+              dd[dtd[index].name][dtd[index].ProjectName] = dtd[index];
             }
           }
-
-           for(const key in dd){
+          console.log("ddd",dd)
+            for(const key in dd){
               for(const mkey in this.ObjectData){
-               if (mkey in dd[key]) {
-                    dd[key][mkey].ProjectName = this.ObjectData[mkey].project_name;
-                    var Count = parseInt(dd[key][mkey].Count);
-                    console.log("Count",Count)
-
-                }else{
-                   dd[key][mkey] = {
+                if (!(this.ObjectData[mkey].project_name in dd[key])) {
+                  dd[key][this.ObjectData[mkey].project_name] = {
                     ProjectName: this.ObjectData[mkey].project_name,
                     name: mkey,
-                   Count: 0
+                    Count: 0
                   };
                 }
-             }
-             this.tableData.push({ name: key, data: dd[key]});
+              }
+              this.tableData.push({ name: key, data: dd[key]});
             }
             console.log("表",this.tableData)
+            let projectArr = []
+            this.newArr.map(item => {
+              projectArr.push(item.project_name)
+            })
+            this.tableData.map(item => {
+              let arr = Object.values(item.data);
+              arr.sort((a,b)=>{
+                return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);
+              });
+              item.data = arr
+            })
          }
       })
     },

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

@@ -114,7 +114,6 @@ export default {
                   if(this.obj.length > 0){
                       let str = ''
                       str = params.data +'次' + '\n(参考值'+ this.obj[params.dataIndex] +'次)'
-                      console.log(str)
                     return str
                   }else{
                     let str = ''