XMLWAN 3 years ago
parent
commit
bab7818552

+ 1 - 1
src/xt_pages/outpatientCharges/costComparison.vue View File

@@ -435,7 +435,7 @@
435 435
             clr_type: '11'
436 436
           }
437 437
           var that = this
438
-          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
438
+          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
439 439
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
440 440
               params: params
441 441
             })

+ 1 - 1
src/xt_pages/outpatientCharges/newStatementPrint.vue View File

@@ -152,7 +152,7 @@
152 152
 
153 153
       },
154 154
       getInfo(order_id) {
155
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
155
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
156 156
 
157 157
           var that = this
158 158
 

+ 9 - 9
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -133,13 +133,13 @@
133 133
                         </el-button>
134 134
 
135 135
                         <el-button
136
-                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106"
136
+                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"
137 137
                                 size="small" @click="open(10)" type="primary"
138 138
                         >退号
139 139
                         </el-button>
140 140
 
141 141
                         <el-button
142
-                        v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106"
142
+                        v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"
143 143
                         size="small" @click="open(11)" type="primary"
144 144
                         >撤销明细
145 145
                         </el-button>
@@ -525,7 +525,7 @@
525 525
     },
526 526
     methods: {
527 527
       query() {
528
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
528
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
529 529
           var that = this
530 530
           axios.get('http://127.0.0.1:9532/api/org/info', {
531 531
             params: {}
@@ -643,7 +643,7 @@
643 643
 
644 644
             })
645 645
 
646
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
646
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990  ) {
647 647
           var that = this
648 648
           axios.get('http://127.0.0.1:9532/api/upload/get', {
649 649
             params: form,
@@ -870,7 +870,7 @@
870 870
 
871 871
             })
872 872
 
873
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
873
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
874 874
 
875 875
           axios.get('http://127.0.0.1:9532/api/register/get', {
876 876
             params: forms,
@@ -1495,7 +1495,7 @@
1495 1495
           }
1496 1496
 
1497 1497
         } else if (index == 5) {
1498
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
1498
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
1499 1499
 
1500 1500
             var that = this
1501 1501
             this.$confirm('是否退费', '退费', {
@@ -1594,7 +1594,7 @@
1594 1594
 
1595 1595
           var that = this
1596 1596
 
1597
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
1597
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
1598 1598
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
1599 1599
               params: params
1600 1600
             })
@@ -1745,7 +1745,7 @@
1745 1745
             })
1746 1746
         } else if (index == 15) {
1747 1747
           var that = this
1748
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
1748
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 ||   this.$store.getters.xt_user.org_id == 9990) {
1749 1749
 
1750 1750
             if (this.diagnosis.length || this.diagnosis == 0) {
1751 1751
               that.$message.error('诊断不能为空,请选择诊断内容')
@@ -1854,7 +1854,7 @@
1854 1854
 
1855 1855
           }
1856 1856
           this.loadingtwo = true
1857
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
1857
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
1858 1858
             var that = this
1859 1859
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
1860 1860
               params: form

+ 1 - 1
src/xt_pages/outpatientCharges/statementPrint.vue View File

@@ -150,7 +150,7 @@ export default {
150 150
 
151 151
     },
152 152
     getInfo(order_id) {
153
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4) {
153
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
154 154
 
155 155
         var that = this
156 156
 

+ 3 - 3
src/xt_pages/outpatientCharges/summary.vue View File

@@ -100,10 +100,10 @@
100 100
                     <template slot-scope="scope">
101 101
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
102 102
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
103
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">
103
+                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || ($store.getters.xt_user.org_id == 9990) ">
104 104
                             结算单
105 105
                         </el-button>
106
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
106
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106  || $store.getters.xt_user.org_id== 9990)">
107 107
                             退费
108 108
                         </el-button>
109 109
                         <!-- <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button> -->
@@ -236,7 +236,7 @@
236 236
         }
237 237
 
238 238
       },toRefund(row){
239
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106) {
239
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
240 240
           var that = this
241 241
           this.$confirm('是否退费', '退费', {
242 242
             confirmButtonText: '确 定',

+ 2 - 2
src/xt_pages/outpatientRegistration/index.vue View File

@@ -1000,7 +1000,7 @@
1000 1000
                 .catch(function(error) {
1001 1001
 
1002 1002
                 })
1003
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
1003
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
1004 1004
               var that = this
1005 1005
 
1006 1006
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1259,7 +1259,7 @@
1259 1259
                 .catch(function(error) {
1260 1260
 
1261 1261
                 })
1262
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538) {
1262
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
1263 1263
               var that = this
1264 1264
 
1265 1265
               axios.get('http://127.0.0.1:9532/api/register/get', {

+ 56 - 51
src/xt_pages/qcd/basicInformationAnalysis.vue View File

@@ -63,13 +63,13 @@
63 63
           :picker-options="pickerOptions"
64 64
         ></el-date-picker>
65 65
       </div>
66
-       <div class="cell clearfix">
66
+       <!-- <div class="cell clearfix">
67 67
         <label class="title"><span class="name">转归情况</span> : </label>
68 68
         <div class="time ">
69 69
           <ul class="">
70 70
             <li
71 71
               :class="item.lapseto == lapsetoType ? 'active' : ''"
72
-              @click="selectLapseOne(item.lapseto)"
72
+              @click="selectLapseTo(item.lapseto)"
73 73
               v-for="item in lapsetoArr"
74 74
               :key="item.value"
75 75
             >
@@ -77,8 +77,8 @@
77 77
             </li>
78 78
           </ul>
79 79
         </div>
80
-      </div>
81
-      <div class="cell clearfix">
80
+      </div> -->
81
+      <!-- <div class="cell clearfix">
82 82
         <label class="title"><span class="name">病人来源</span> : </label>
83 83
         <div class="time ">
84 84
           <ul class="">
@@ -92,7 +92,7 @@
92 92
             </li>
93 93
           </ul>
94 94
         </div>
95
-      </div>
95
+      </div> -->
96 96
 
97 97
        <div class="cell clearfix" v-show="treatShow">
98 98
         <label class="title">
@@ -243,12 +243,10 @@
243 243
                 <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
244 244
               </div>
245 245
               <div class="borderBox1">
246
-                 <span v-if="lapsetoType == 0 || lapsetoType == 1"><p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
247
-                  <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
248
-                </span>
249
-                <span v-if="lapsetoType == 0 || lapsetoType == 2"><p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
250
-                 <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
251
-                </span> 
246
+                <p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
247
+                <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
248
+                <p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
249
+                <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
252 250
               </div>
253 251
             </div>
254 252
             <div class="infoOne">
@@ -329,7 +327,7 @@
329 327
         </div>
330 328
         <div>
331 329
 
332
-        <!-- <div class="cell clearfix" v-show="treatShow">
330
+        <div class="cell clearfix" v-show="treatShow">
333 331
         <label class="title">
334 332
           <span class="name">转归状态</span> :
335 333
         </label>
@@ -343,7 +341,7 @@
343 341
             >{{ item.label }}</li>
344 342
           </ul>
345 343
         </div>
346
-       </div> -->
344
+       </div>
347 345
 
348 346
           <p style="font-size: 16px;font-weight: bold;color: #000;">转归统计</p>
349 347
           <line-chart :options="bar"></line-chart>
@@ -423,7 +421,7 @@ export default {
423 421
         { value: 0, label: '全部', source: 0, lapseto: 0 },
424 422
         { value: 1, label: '转出', source: 0, lapseto: 2 },
425 423
         { value: 2, label: '留治', source: 0, lapseto: 1 },
426
-        // { value: 3, label: '死亡', source:0,  lapseto: 3 },
424
+        { value: 3, label: '死亡', source:0,  lapseto: 3 },
427 425
       ],
428 426
       sourceType: 0,
429 427
       sourceArr: [
@@ -654,7 +652,7 @@ export default {
654 652
         //统计转归状态
655 653
         this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
656 654
         //统计男女比例
657
-        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
655
+        this.getTotalSexCount(timeStar,timeEnd)
658 656
         //统计传染病
659 657
         this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
660 658
         //统计年龄
@@ -664,7 +662,7 @@ export default {
664 662
         this.start = timeStar
665 663
         this.end =timeEnd
666 664
         this.getCountModeId()
667
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
665
+        this.getRolloutCount(timeStar,timeEnd)
668 666
       }
669 667
     },
670 668
     changeEndTime(val) {
@@ -692,7 +690,7 @@ export default {
692 690
         this.start = timeStar
693 691
         this.end =timeEnd
694 692
         this.getCountModeId()
695
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
693
+        this.getRolloutCount(timeStar,timeEnd)
696 694
       }
697 695
     },
698 696
     selectLapseTo(state) {
@@ -701,7 +699,7 @@ export default {
701 699
       //获取本月当前机构的透析模式
702 700
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
703 701
       const endDate = moment(new Date()).format('YYYY-MM-DD')
704
-     
702
+
705 703
       var now = new Date()
706 704
       var nowMonth = now.getMonth(); //当前月
707 705
       var nowYear = now.getFullYear(); //当前年
@@ -730,14 +728,14 @@ export default {
730 728
         this.start = timeStar
731 729
         this.end = timeEnd
732 730
         this.getCountModeId()
733
-        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
731
+        this.getRolloutCount(timeStar,timeEnd)
734 732
       }
735 733
       //近三月
736 734
       if(state == 1){
737 735
         this.listQuery.start_time = ""
738 736
         this.listQuery.end_time = ""
739 737
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
740
-       
738
+
741 739
         var startunitx = Date.parse(startDate)/1000
742 740
         // console.log("开始时间搓",startunitx)
743 741
         const endDate = moment(new Date()).format('YYYY-MM-DD')
@@ -759,7 +757,7 @@ export default {
759 757
         this.start = startunitx
760 758
         this.end = endunitx
761 759
         this.getCountModeId()
762
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
760
+        this.getRolloutCount(startunitx,endunitx)
763 761
       }
764 762
 
765 763
      //近半年
@@ -790,7 +788,7 @@ export default {
790 788
         this.start = startunitx
791 789
         this.end = endunitx
792 790
         this.getCountModeId()
793
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
791
+        this.getRolloutCount(startunitx,endunitx)
794 792
      }
795 793
 
796 794
      //近一年
@@ -817,10 +815,11 @@ export default {
817 815
         this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
818 816
         //统计透析年龄
819 817
         this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
818
+
820 819
         this.start = startunitx
821 820
         this.end = endunitx
822 821
         this.getCountModeId()
823
-        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
822
+        this.getRolloutCount(startunitx,endunitx)
824 823
      }
825 824
 
826 825
 
@@ -843,12 +842,12 @@ export default {
843 842
          if(response.data.state == 1){
844 843
 
845 844
           var modetype =  response.data.data.modetype
846
-         
845
+
847 846
           this.modetype = modetype
848 847
           var total =  response.data.data.total
849
-          
850
-          this.total = total.count
851
-          // this.total = total
848
+
849
+          // this.total = total.count
850
+          this.total = total
852 851
           // console.log("数据",this.modetype)
853 852
           var modedate = response.data.data.modetype
854 853
           for(let i=0;i<modedate.length;i++){
@@ -920,52 +919,61 @@ export default {
920 919
       })
921 920
     },
922 921
     //统计转归
923
-    getTotalLapseCount(startDate,endDate,lapsetoType,sourceType ){
924
-   
922
+    getTotalLapseCount(startDate,endDate){
925 923
        this.modesDataTwo.series = []
926 924
        this.modesDataTwo.xAxis = []
927
-      getTotalLapseCount(startDate,endDate,lapsetoType,sourceType).then(response=>{
925
+      getTotalLapseCount(startDate,endDate).then(response=>{
928 926
          if(response.data.state == 1){
929 927
            var arr = [
930 928
              {name:"留治",count:0},
931 929
              {name:"转出",count:0}
932 930
            ]
933 931
           var patients =  response.data.data.patients
934
-      
935
-          this.rollOutTotal = patients.length
936 932
 
933
+          this.rollOutTotal = patients.length
937 934
           var patienttwo = response.data.data.patienttwo
935
+
938 936
           this.outTotal = patienttwo.length
939 937
           var count = response.data.data.count
940 938
           this.patientCount = count
941 939
 
942 940
           var rollout = response.data.data.rollout
943
-        
941
+          console.log("rollout",rollout)
944 942
 
945 943
           for(let i=0;i<arr.length;i++){
946 944
             arr[0].count = this.rollOutTotal
947 945
             arr[1].count = this.outTotal
948 946
           }
947
+
948
+          // for(let j=0;j<arr.length;j++){
949
+          //   this.modesDataTwo.xAxis.push(arr[j].name)
950
+          //   this.modesDataTwo.series.push(((arr[j].count/count)*100).toFixed(1))
951
+          // }
952
+          // this.bar.series[0].data = this.modesDataTwo.series
953
+          // this.bar.xAxis.data = this.modesDataTwo.xAxis
954
+          // this.getArrLength(this.bar.xAxis.data)
955
+
949 956
          }
950 957
       })
951 958
     },
952 959
     //统计男女比例
953
-    getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType){
954
-      getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
960
+    getTotalSexCount(timeStar,timeEnd){
961
+      getTotalSexCount(timeStar,timeEnd).then(response=>{
955 962
         if(response.data.state === 1){
956
-          console.log("resp2222",response.data.data.totalWoman)
957 963
           var total = response.data.data.total
964
+        //  console.log("总人数",total)
958 965
           this.totalGender = total
959 966
           var totalMan = response.data.data.totalSex
967
+       //  console.log("男人",totalMan)
960 968
           this.totalMan = totalMan
961
-          var totalWoman = response.data.data.totalWoman
969
+          var totalWoman = total - totalMan
962 970
           this.totalWoman = totalWoman
963 971
         }
964 972
       })
965 973
     },
966 974
     //统计传染病
967
-    getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType){
968
-       getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
975
+    getTotalInfectiousCount(timeStar,timeEnd){
976
+       getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
969 977
            if(response.data.state === 1){
970 978
              this.InfectiousTotal = response.data.data.total
971 979
              var infectious = response.data.data.count
@@ -988,10 +996,11 @@ export default {
988 996
            }
989 997
        })
990 998
     },
991
-    getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType){
992
-      getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
999
+    getTotalAgeCount(timeStar,timeEnd){
1000
+      getTotalAgeCount(timeStar,timeEnd).then(response=>{
993 1001
          if(response.data.state == 1){
994 1002
           var ageCount =  response.data.data.ageCount
1003
+          // console.log("ageCount",ageCount)
995 1004
           var arr = []
996 1005
           arr =  ageCount.sort(this.compare('age'))
997 1006
           this.ageCount = arr
@@ -1009,8 +1018,8 @@ export default {
1009 1018
           }
1010 1019
       },
1011 1020
     //统计透析年龄
1012
-    getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType){
1013
-      getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
1021
+    getTotalDialysisCount(timeStar,timeEnd){
1022
+      getTotalDialysisCount(timeStar,timeEnd).then(response=>{
1014 1023
          if(response.data.state == 1){
1015 1024
            var dataage =  response.data.data.dataage
1016 1025
           //  console.log("dataage",dataage)
@@ -1167,9 +1176,7 @@ export default {
1167 1176
        this.modesDataTwo.xAxis = []
1168 1177
         const params = {
1169 1178
           start_time:this.start,
1170
-          end_time:this.end,
1171
-          lapsetotype:this.lapsetoType,
1172
-          sourcetype:this.sourceType,
1179
+          end_time:this.end
1173 1180
         }
1174 1181
       getRolloutCount(params).then(response=>{
1175 1182
          if(response.data.state == 1){
@@ -1218,10 +1225,8 @@ export default {
1218 1225
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1219 1226
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1220 1227
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1221
-      this.getRolloutCount(this.lapsetoType,this.sourceType)
1222 1228
     },
1223
-    selectLapseOne(lapseto) {
1224
-      console.log("lapseto22222",lapseto)
1229
+    selectLapseTo(lapseto) {
1225 1230
       this.lapsetoType = lapseto
1226 1231
       this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1227 1232
       this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
@@ -1229,7 +1234,6 @@ export default {
1229 1234
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1230 1235
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1231 1236
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
1232
-      this.getRolloutCount(this.lapsetoType,this.sourceType)
1233 1237
     },
1234 1238
   },
1235 1239
   created() {
@@ -1266,7 +1270,7 @@ export default {
1266 1270
       this.start = timeStar
1267 1271
       this.end = timeEnd
1268 1272
 
1269
-     this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
1273
+     this.getRolloutCount(timeStar,timeEnd)
1270 1274
 
1271 1275
 
1272 1276
   },
@@ -1417,3 +1421,4 @@ export default {
1417 1421
 </style>
1418 1422
 
1419 1423
 
1424
+

+ 1 - 1
src/xt_pages/upload/fast/One.vue View File

@@ -5,7 +5,7 @@
5 5
       <div class="information">
6 6
         <div class="row">
7 7
           <div class="rowOne">
8
-            <p class="rowName">首次诊治时间:</p>
8
+            <p class="rowName">首次透析时间:</p>
9 9
             <el-input
10 10
               placeholder="请输入内容"
11 11
               v-model="form.first_treatment_date"

+ 1 - 1
src/xt_pages/user/components/PatientForm.vue View File

@@ -785,7 +785,7 @@
785 785
             </el-col>
786 786
 
787 787
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
788
-              <el-form-item label="首次诊治时间 : ">
788
+              <el-form-item label="首次透析时间 : ">
789 789
                 <el-date-picker
790 790
                   v-model="form.first_treatment_date"
791 791
                   type="date"