See999 4 vuotta sitten
vanhempi
commit
c25a61aee7

+ 13 - 0
src/api/common/common.js Näytä tiedosto

@@ -63,6 +63,7 @@ export function getAllInspectionMinor(params) {
63 63
 }
64 64
 
65 65
 export function UpdateConfiguration(id, data) {
66
+  console.log('data', data)
66 67
   return request({
67 68
     url: 'com/api/updateconfiguration?id=' + id,
68 69
     method: 'post',
@@ -130,3 +131,15 @@ export function DeleteCheck(id, params) {
130 131
     params: params
131 132
   })
132 133
 }
134
+
135
+export function getDialysisModeType(startime, endtime) {
136
+  const params = {
137
+    startime: startime,
138
+    endtime: endtime
139
+  }
140
+  return request({
141
+    url: '/com/api/getdialysismodetype',
142
+    method: 'get',
143
+    params: params
144
+  })
145
+}

File diff suppressed because it is too large
+ 1395 - 1410
src/store/modules/globalConfig.js


+ 13 - 11
src/xt_pages/data/prescription.vue Näytä tiedosto

@@ -813,7 +813,6 @@ export default {
813 813
       row.index = rowIndex;
814 814
     },
815 815
     onRowClicks(row, event, column) {
816
-      console.log("row------", row.id);
817 816
       this.current_select = row.id;
818 817
       this.mode_name = row.name;
819 818
       this.isEdit = false;
@@ -883,13 +882,19 @@ export default {
883 882
       );
884 883
 
885 884
       getSystemPrescription(params).then(response => {
885
+        
886 886
         if (response.data.state == 0) {
887 887
           this.$message.error(response.data.msg);
888 888
           return false;
889 889
         } else {
890
-          if (response.data.data.prescription.id > 0) {
891
-            for (const key in response.data.data.prescription) {
892
-              this.addPlan[key] = response.data.data.prescription[key];
890
+           var prescription =  response.data.data.prescription
891
+           if(prescription.anticoagulant == 3){
892
+              prescription.anticoagulant = "低分子肝素"
893
+           }
894
+          if (prescription.id > 0) {
895
+            
896
+            for (const key in prescription) {
897
+              this.addPlan[key] = prescription[key];
893 898
             }
894 899
 
895 900
             this.dialysisTimeShow = new Date(
@@ -922,6 +927,8 @@ export default {
922 927
           return false;
923 928
         } else {
924 929
           this.system_prescription = response.data.data.prescriptions;
930
+          console.log("为什么",this.system_prescription)
931
+          
925 932
           for (let i = 0; i < this.system_prescription.length; i++) {
926 933
             if (this.system_prescription[i].mode == 1) {
927 934
               this.isEdit = true;
@@ -931,12 +938,6 @@ export default {
931 938
       });
932 939
     },
933 940
     selectnDialysisTime(val) {
934
-      console.log(val);
935
-
936
-      console.log(this.addPlan.dialysis_duration);
937
-      console.log(this.addPlan.dialysis_duration_hour);
938
-      console.log(this.addPlan.dialysis_duration_minute);
939
-
940 941
       var valTime = val.split(":");
941 942
       this.addPlan.dialysis_duration =
942 943
         parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2));
@@ -945,7 +946,7 @@ export default {
945 946
     },
946 947
     changeThisAnticoagulant() {
947 948
       var thismode = parseInt(this.addPlan.anticoagulant);
948
-      console.log("------", thismode);
949
+     
949 950
       if (isNaN(thismode) || thismode <= 0) {
950 951
         return false;
951 952
       }
@@ -974,6 +975,7 @@ export default {
974 975
             this.isEdit = true;
975 976
             this.system_prescription = [];
976 977
             this.system_prescription = response.data.data.prescriptions;
978
+            console.log("触发了吗",this.system_prescription)
977 979
             this.addPlan.id = response.data.data.prescription.id;
978 980
             return false;
979 981
           }

+ 82 - 21
src/xt_pages/qcd/basicInformationAnalysis.vue Näytä tiedosto

@@ -53,27 +53,14 @@
53 53
             <div class="infoOne">
54 54
               <div class="titleBox">
55 55
                 <span class="point"></span>
56
-                <p class="infoTitle">透析总量(100次)</p>
56
+                <p class="infoTitle">透析总量({{total}}次)</p>
57 57
               </div>
58
+            
58 59
               <div class="borderBox">
59
-                <p>HD:64次(64%)</p>
60
-                <el-progress :percentage="70"></el-progress>
61
-                <p>HD:64次(64%)</p>
62
-                <el-progress :percentage="70"></el-progress>
63
-                <p>HD:64次(64%)</p>
64
-                <el-progress :percentage="70"></el-progress>
65
-                <p>HD:64次(64%)</p>
66
-                <el-progress :percentage="70"></el-progress>
67
-                <p>HD:64次(64%)</p>
68
-                <el-progress :percentage="70"></el-progress>
69
-                <p>HD:64次(64%)</p>
70
-                <el-progress :percentage="70"></el-progress>
71
-                <p>HD:64次(64%)</p>
72
-                <el-progress :percentage="70"></el-progress>
73
-                <p>HD:64次(64%)</p>
74
-                <el-progress :percentage="70"></el-progress>
75
-                <p>HD:64次(64%)</p>
60
+               <div v-for="(item,index) in modetype" :key="index">
61
+                <p>{{item.mode_id}}:{{getTotalCount(item.mode_id)}}次(64%)</p>
76 62
                 <el-progress :percentage="70"></el-progress>
63
+               </div>
77 64
                 <p>HD:64次(64%)</p>
78 65
                 <el-progress :percentage="70"></el-progress>
79 66
               </div>
@@ -160,10 +147,12 @@
160 147
 
161 148
 
162 149
 <script>
150
+const moment = require('moment')
163 151
 import { GetOICData } from "@/api/qcd";
164 152
 import PieChart from "../qcd/components/BarChart";
165 153
 import { uParseTime } from "@/utils/tools";
166 154
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
155
+import {getDialysisModeType} from "@/api/common/common"
167 156
 export default {
168 157
   name: "dialysisTotal",
169 158
   components: {
@@ -188,10 +177,11 @@ export default {
188 177
         { value: 1, label: "近三个月", state: 1 },
189 178
         { value: 2, label: "近半年", state: 2 },
190 179
         { value: 3, label: "近一年", state: 3 }
191
-      ]
180
+      ],
181
+      modetype:[],
182
+      total:0,
192 183
     };
193 184
   },
194
-  created() {},
195 185
   methods: {
196 186
     getTimestamp(time) {
197 187
       // 把时间日期转成时间戳
@@ -210,8 +200,79 @@ export default {
210 200
     selectLapseTo(state) {
211 201
       this.stateType = state;
212 202
       this.listQuery.state = state;
203
+    },
204
+    getDialysisModeType(startDate,endDate){
205
+      getDialysisModeType(startDate,endDate).then(response=>{
206
+         if(response.data.state == 1){
207
+           var modetype =  response.data.data.modetype
208
+            var total =  response.data.data.total
209
+            console.log("total",total)
210
+            this.total = total
211
+           for(let i=0;i<modetype.length;i++){
212
+             if(modetype[i].mode_id == 1){
213
+               modetype[i].mode_id = "HD"
214
+             }
215
+             if(modetype[i].mode_id == 2){
216
+               modetype[i].mode_id = "HDF"
217
+             }
218
+             if(modetype[i].mode_id == 3){
219
+               modetype[i].mode_id = "HD+HP"
220
+             }
221
+              if(modetype[i].mode_id == 4){
222
+               modetype[i].mode_id = "HP"
223
+             }
224
+              if(modetype[i].mode_id == 5){
225
+               modetype[i].mode_id = "HF"
226
+             }
227
+             if(modetype[i].mode_id == 6){
228
+               modetype[i].mode_id = "SCUF"
229
+             }
230
+             if(modetype[i].mode_id == 7){
231
+               modetype[i].mode_id = "IUF"
232
+             }
233
+              if(modetype[i].mode_id == 8){
234
+               modetype[i].mode_id = "HFHD"
235
+             }
236
+             if(modetype[i].mode_id == 9){
237
+               modetype[i].mode_id = "HFHD+HP"
238
+             }
239
+             if(modetype[i].mode_id == 10){
240
+               modetype[i].mode_id = "PHF"
241
+             }
242
+             if(modetype[i].mode_id == 11){
243
+               modetype[i].mode_id = "HFR"
244
+             }
245
+            if(modetype[i].mode_id == 12){
246
+               modetype[i].mode_id = "HDF+HP"
247
+             }
248
+              if(modetype[i].mode_id == 13){
249
+               modetype[i].mode_id = "HFHD+HP"
250
+             }
251
+              if(modetype[i].mode_id == 14){
252
+               modetype[i].mode_id = "腹水回输"
253
+             }
254
+            if(modetype[i].mode_id == 19){
255
+               modetype[i].mode_id = "IUF+HD"
256
+             }
257
+           }
258
+           this.modetype = modetype
259
+           console.log("modetype",modetype)
260
+           
261
+         }
262
+      })
263
+    },
264
+    getTotalCount(id){
265
+      console.log("id",id)
213 266
     }
214
-  }
267
+  },
268
+  created() {
269
+     //获取本月当前机构的透析模式
270
+      const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
271
+      console.log("开始时间",startDate)
272
+      const endDate = moment(new Date()).format('YYYY-MM-DD')
273
+      console.log("结束时间",endDate)
274
+      this.getDialysisModeType(startDate,endDate)
275
+  },
215 276
 };
216 277
 </script>
217 278
 

+ 13 - 3
src/xt_pages/qcd/checkStatistical.vue Näytä tiedosto

@@ -164,6 +164,10 @@ export default {
164 164
            this.editform.id = checkdetail.id
165 165
            this.editform.inspectionMajor = checkdetail.inspection_major
166 166
            this.editform.frequency = checkdetail.inspection_frequency
167
+           if(checkdetail.sort == 0){
168
+             this.editform.sort = ""
169
+             return 
170
+           }
167 171
            this.editform.sort = checkdetail.sort
168 172
          }
169 173
        })
@@ -221,9 +225,15 @@ export default {
221 225
       })
222 226
     },
223 227
     UpdateCheck(formName){
224
-       var sort = this.editform.sort 
225
-       var sorts = parseInt(sort)
226
-       this.editform.sort = sorts
228
+       if(this.editform.sort == ""){
229
+         this.editform.sort = 0
230
+       }
231
+       if(this.editform.sort !=""){
232
+         var sort = this.editform.sort 
233
+         var sorts = parseInt(sort)
234
+         this.editform.sort = sorts
235
+       }
236
+     
227 237
       this.$refs[formName].validate(valid=>{
228 238
         if(valid){
229 239
           UpdateCheck(this.editform.id,this.editform).then(response=>{

+ 15 - 3
src/xt_pages/qcd/statisticalConfiguration.vue Näytä tiedosto

@@ -202,6 +202,10 @@ export default {
202 202
            this.editform.inspectionMinor = configurationdetail.inspection_minor
203 203
            this.editform.large_range = configurationdetail.large_range
204 204
            this.editform.min_range = configurationdetail.min_range
205
+           if(configurationdetail.sort == 0){
206
+            this.editform.sort = ""
207
+            return
208
+           }
205 209
            this.editform.sort = configurationdetail.sort
206 210
          }
207 211
       })
@@ -306,9 +310,15 @@ export default {
306 310
       })
307 311
     },
308 312
     EditConfiguration(formName){
309
-       var sorts =  this.editform.sort
310
-       var sort = parseInt(sorts)
311
-       this.editform.sort = sort
313
+       if(this.editform.sort == ""){
314
+         this.editform.sort = 0
315
+       }
316
+       if(this.editform.sort!=""){
317
+        var sorts =  this.editform.sort
318
+        var sort = parseInt(sorts)
319
+        this.editform.sort = sort
320
+       }
321
+     
312 322
       UpdateConfiguration(this.editform.id,this.editform).then(response=>{
313 323
         if(response.data.state == 1){
314 324
          var standard =  response.data.data.standard
@@ -316,6 +326,8 @@ export default {
316 326
          this.$message.success("保存成功")
317 327
          this.editDialog = false
318 328
          this.getConfigurationList()
329
+        }else{
330
+         this.$message.error("检查小项已存在")
319 331
         }
320 332
       })
321 333
     },

+ 10 - 4
src/xt_pages/user/dialysisSolution.vue Näytä tiedosto

@@ -1248,9 +1248,9 @@ export default {
1248 1248
       this.fetchPatientDialysisSolutions();
1249 1249
     },
1250 1250
     openEdit(index, row) {
1251
-      console.log(row);
1251
+     
1252 1252
       this.current_index = index;
1253
-
1253
+     
1254 1254
       this.addPlan.id = row.id;
1255 1255
       this.addPlan.mode = row.mode_id;
1256 1256
       this.addPlan.mode_name = row.mode_name;
@@ -1262,7 +1262,12 @@ export default {
1262 1262
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + "";
1263 1263
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + "";
1264 1264
       this.addPlan.blood_flow_volume = row.blood_flow_volume.toString();
1265
-      this.addPlan.anticoagulant = row.anticoagulant;
1265
+      if(row.anticoagulant == 3){
1266
+        this.addPlan.anticoagulant = "低分子肝素"
1267
+      }
1268
+      if(row.anticoagulant != 3){
1269
+         this.addPlan.anticoagulant = row.anticoagulant;
1270
+      }
1266 1271
       this.addPlan.replacement_total = row.replacement_total;
1267 1272
 
1268 1273
       this.addPlan.target_ktv = row.target_ktv.toString();
@@ -1292,7 +1297,7 @@ export default {
1292 1297
       this.addPlan.displace_liqui_value = row.displace_liqui_value.toString();
1293 1298
       this.addPlan.ultrafiltration = row.ultrafiltration.toString();
1294 1299
       this.addPlan.blood_access = row.blood_access;
1295
-
1300
+     
1296 1301
       this.addPlan.registrars_id = row.registrars_id;
1297 1302
 
1298 1303
       this.dialogVisible = true;
@@ -1655,6 +1660,7 @@ export default {
1655 1660
     // this.fetchAllDoctorAndNurse();
1656 1661
     this.fetchAllAdminUsers();
1657 1662
     this.fetchPatientDialysisSolutions();
1663
+   
1658 1664
   }
1659 1665
 };
1660 1666
 </script>

+ 7 - 1
src/xt_pages/user/patients.vue Näytä tiedosto

@@ -1075,7 +1075,13 @@
1075 1075
                 return
1076 1076
               }
1077 1077
 
1078
-              this.exportVisible = true
1078
+              // this.exportVisible = true
1079
+              this.$alert('您提交的患者名单已上传成功,系统正在执行导入,请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
1080
+                confirmButtonText: '确定',
1081
+                callback: action => {
1082
+
1083
+                }
1084
+              });
1079 1085
               let params = {
1080 1086
                 'patients': this.export_date
1081 1087
               }

+ 18 - 36
src/xt_pages/workforce/appointment.vue Näytä tiedosto

@@ -499,49 +499,20 @@
499 499
 
500 500
 
501 501
           var isHas_1 = headers.includes('区号')
502
-          console.log(isHas_1)
503 502
           var isHas_2 = headers.includes('机号')
504
-          console.log(isHas_2)
505
-
506 503
           var isHas_3 = headers.includes('周一')
507
-          console.log(isHas_3)
508
-
509 504
           var isHas_4 = headers.includes('')
510
-          console.log(isHas_4)
511
-
512 505
           var isHas_5 = headers.includes('_1')
513
-          console.log(isHas_5)
514
-
515 506
           var isHas_6 = headers.includes('周二')
516
-          console.log(isHas_6)
517
-
518 507
           var isHas_7 = headers.includes('_2')
519
-          console.log(isHas_7)
520
-
521 508
           var isHas_8 = headers.includes('_3')
522
-          console.log(isHas_8)
523
-
524 509
           var isHas_9 = headers.includes('周三')
525
-          console.log(isHas_9)
526
-
527 510
           var isHas_10 = headers.includes('_4')
528
-          console.log(isHas_1)
529
-
530 511
           var isHas_11 = headers.includes('_5')
531
-          console.log(isHas_1)
532
-
533 512
           var isHas_12 = headers.includes('周四')
534
-          console.log(isHas_1)
535
-
536 513
           var isHas_13 = headers.includes('_6')
537
-          console.log(isHas_1)
538
-
539 514
           var isHas_14 = headers.includes('_7')
540
-          console.log(isHas_1)
541
-
542 515
           var isHas_15 = headers.includes('周五')
543
-          console.log(isHas_1)
544
-
545 516
           var isHas_16 = headers.includes('_8')
546 517
           console.log(isHas_1)
547 518
 
@@ -700,6 +671,8 @@
700 671
         }
701 672
 
702 673
         let datas = []
674
+        let failed_datas = []
675
+
703 676
         for (let i = 0; i < results.length; i++) {
704 677
           for (let key in results[i + 1]) {
705 678
             let tempObjTwo = { partition_name: '', device_number_name: '' }
@@ -735,11 +708,11 @@
735 708
               var m_month = current_date.getMonth() + 1
736 709
               m_month = m_month < 10 ? '0' + m_month.toString() : m_month.toString()
737 710
               var m_date = current_date.getDate() < 10 ? '0' + current_date.getDate().toString() : current_date.getDate().toString()
738
-
739 711
               var current_date_two = new Date(m_year + '-' + m_month + '-' + m_date)
740
-
741
-              if (new Date(tempObjTwo['schedule_date']).getTime() >= new Date(current_date_two).getTime()) {
712
+              if (new Date(tempObjTwo['schedule_date']).getTime() > new Date(current_date_two).getTime()) {
742 713
                 datas.push(tempObjTwo)
714
+              }else{
715
+                failed_datas.push(tempObjTwo)
743 716
               }
744 717
             }
745 718
           }
@@ -830,8 +803,20 @@
830 803
             this.isExistRepeatVisible = true
831 804
             return
832 805
           } else {
806
+            // this.exportVisible = true
807
+
808
+            this.$alert('您提交的排班信息已上传成功,系统正在执行导入,请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
809
+              confirmButtonText: '确定',
810
+              callback: action => {
811
+
812
+              }
813
+            });
814
+
815
+
833 816
             let params = {
834
-              schedule: datas
817
+              schedule: datas,
818
+              failed_schedule: failed_datas
819
+
835 820
             }
836 821
 
837 822
             //今天的时间
@@ -839,10 +824,7 @@
839 824
             day2.setTime(day2.getTime())
840 825
             var month = day2.getMonth() + 1 < 10 ? '0' + (day2.getMonth() + 1).toString() : (day2.getMonth() + 1).toString()
841 826
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
842
-
843 827
             var date = day2.getFullYear() + '-' + month + '-' + day
844
-            this.exportVisible = true
845
-
846 828
             exportSchedule(params, date).then(response => {
847 829
               if (response.data.state == 0) {
848 830
                 return false

+ 28 - 12
src/xt_pages/workforce/template.vue Näytä tiedosto

@@ -312,13 +312,13 @@
312 312
       },
313 313
       handleSuccess({ results, header }) {
314 314
 
315
-        console.log(this.template_mode.mode)
315
+        let headers = []
316
+        for (let key in results[0]) {
317
+          headers.push(key)
318
+        }
316 319
         if (this.template_mode.mode == 1) {
317 320
           if(results.length > 0) {
318
-            let headers = []
319
-            for (let key in results[0]) {
320
-              headers.push(key)
321
-            }
321
+
322 322
             var isHas_1 = headers.includes('区号')
323 323
             console.log(isHas_1)
324 324
             var isHas_2 = headers.includes('机号')
@@ -402,12 +402,7 @@
402 402
           }
403 403
 
404 404
         }else if(this.template_mode.mode == 2){
405
-
406 405
           if(results.length > 0) {
407
-            let headers = []
408
-            for (let key in results[0]) {
409
-              headers.push(key)
410
-            }
411 406
 
412 407
             var isHas_1 = headers.includes('区号')
413 408
             console.log(isHas_1)
@@ -706,7 +701,21 @@
706 701
           }
707 702
         }
708 703
 
709
-        if (!is_system_zone || !is_device_number) {
704
+        let isHeader = true
705
+
706
+        if(this.template_mode.mode == 1){
707
+          if(headers.length > 23){
708
+            isHeader = false
709
+          }
710
+
711
+        }else if(this.template_mode.mode == 2){
712
+          if(headers.length > 44){
713
+            isHeader = false
714
+          }
715
+
716
+        }
717
+
718
+        if (!isHeader || !is_system_zone || !is_device_number) {
710 719
           this.dialogVisible = true
711 720
           return
712 721
         } else {
@@ -714,7 +723,14 @@
714 723
             this.isExistRepeatVisible = true
715 724
             return
716 725
           } else {
717
-            this.exportVisible = true
726
+
727
+            this.$alert('您提交的排班信息已上传成功,系统正在执行导入,请稍候点击当前页面右上角“下载日志”查看导入结果', '上传成功', {
728
+              confirmButtonText: '确定',
729
+              callback: action => {
730
+
731
+              }
732
+            });
733
+
718 734
             let params = {
719 735
               schedule: datas
720 736
             }