Browse Source

提交代码

陈少旭 1 year ago
parent
commit
ac258192f8

+ 15 - 8
src/xt_pages/hospitalStation/doctorDesk.vue View File

@@ -1275,16 +1275,23 @@
1275 1275
                 var preTime = ''
1276 1276
 
1277 1277
                 if (prescription.pre_time == 0) {
1278
-                  if (this.schedule.schedule_type == 1) {
1279
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1280
-                  } else if (this.schedule.schedule_type == 2) {
1281
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1282
-                  } else if (this.schedule.schedule_type == 3) {
1283
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1278
+                  if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
1279
+                    if (this.schedule.schedule_type == 1) {
1280
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1281
+                    } else if (this.schedule.schedule_type == 2) {
1282
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1283
+                    } else if (this.schedule.schedule_type == 3) {
1284
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1285
+                    }
1286
+                  }else{
1287
+                    preTime = ""
1284 1288
                   }
1285
-                  // preTime = nowTime
1286 1289
                 } else {
1287
-                  preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
1290
+                  if (this.$store.getters.xt_user.org.id != 10210  || this.$store.getters.xt_user.org.id != 0){
1291
+                    preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
1292
+                  }else{
1293
+                    preTime = ""
1294
+                  }
1288 1295
                 }
1289 1296
 
1290 1297
                 let index = i + 1

+ 3 - 3
src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue View File

@@ -63,8 +63,8 @@
63 63
         <div style="display:flex;justify-content: space-between;">
64 64
             <div style="position: absolute;top:190px;left:50px"></div>
65 65
             <div style="position: absolute;top:190px;left:130px"></div>
66
-            <div style="position: absolute;top:190px;left:180px"></div>
67
-            <div style="position: absolute;top:190px;left:260px"></div>
66
+            <div style="position: absolute;top:190px;left:180px">诊察费</div>
67
+            <div style="position: absolute;top:190px;left:260px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
68 68
             <div style="position: absolute;top:190px;left:340px">材料费</div>
69 69
             <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
70 70
             <div style="position: absolute;top:190px;left:480px"></div>
@@ -182,7 +182,7 @@ export default {
182 182
                 console.log('res',res)
183 183
                 this.list = res.data.data
184 184
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
185
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
185
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
186 186
                 if(this.totalPrice == 0){
187 187
 
188 188
                   this.totalPrice = this.list.medfee_sumamt

+ 8 - 9
src/xt_pages/outpatientCharges/summary.vue View File

@@ -116,7 +116,7 @@
116 116
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
117 117
           <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
118 118
 
119
-          <!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
119
+<!--                    <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
120 120
 
121 121
 
122 122
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
@@ -124,13 +124,12 @@
124 124
           <!--          </el-button-->
125 125
           <!--          >-->
126 126
 
127
-                              <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
128
-          <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
129
-          <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
130
-<!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
131
-<!--          <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
132
-
133
-          <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
127
+<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
128
+          <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
129
+          <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
130
+          <!-- <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
131
+          <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
132
+          <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
134 133
 
135 134
 
136 135
         </div>
@@ -1215,7 +1214,7 @@ export default {
1215 1214
                 name: order.patient.name,
1216 1215
                 id_card_no: order.patient.id_card_no,
1217 1216
                 year: "2023",
1218
-                month: "03",
1217
+                month: "04",
1219 1218
                 code: data[b].code,
1220 1219
                 pric: data[b].total ,
1221 1220
                 item_name: data[b].name,

+ 2 - 5
src/xt_pages/outpatientTool/components/detail.vue View File

@@ -89,7 +89,7 @@
89 89
 
90 90
             <el-table-column align="center" prop="total" label="费用总额">
91 91
                 <template slot-scope="scope">
92
-                    <div>{{scope.row.total}}</div>
92
+                    <div>{{scope.row.total.toFixed(2)}}</div>
93 93
                 </template>
94 94
             </el-table-column>
95 95
 
@@ -386,10 +386,7 @@
386 386
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
387 387
                 if (new_name != undefined){
388 388
                   if (new_name.length != 0) {
389
-                    console.log(total)
390
-                    console.log(tempPatientsTwo[i].new_order_info[b].item_total)
391
-
392
-                    total = parseFloat(total) + parseFloat(tempPatientsTwo[i].new_order_info[b].item_total).toFixed(2)
389
+                    total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString())).toFixed(2))
393 390
                   }
394 391
 
395 392
 

+ 38 - 29
src/xt_pages/user/ktv.vue View File

@@ -162,6 +162,9 @@
162 162
               <el-form-item
163 163
                 :label="item.item_name"
164 164
                 :key="item.item_id"
165
+                :rules="item.item_name != 'URR(%)'?[
166
+                { required: true, message: '请输入数值', trigger: 'blur' }
167
+              ]:[]"
165 168
                 :prop="'formItem.' + index + '.value'"
166 169
               >
167 170
                 <el-input
@@ -614,39 +617,24 @@ export default {
614 617
     calURR(items, value){
615 618
       let valueOne = 0
616 619
       let valueTwo = 0
617
-      let valueThree = 0
618
-      let valueFour = 0
619
-      let valueSix = 0
620 620
 
621 621
       for(let i = 0; i < items.length; i++){
622 622
         if(items[i].item_name == "透析前尿素氮"){
623
-
624 623
           valueOne = items[i].value
625 624
         }
626 625
         if(items[i].item_name == "透析后尿素氮"){
627 626
           valueTwo = items[i].value
628 627
         }
629
-        if(items[i].item_name == "透析时间"){
630
-
631
-          valueThree = items[i].value
632
-
633
-        }
634
-        if(items[i].item_name == "实际超滤量"){
635
-          valueFour = items[i].value
636
-
637
-        }
638
-        if(items[i].item_name == "透后体重"){
639
-          valueSix = items[i].value
640
-        }
641
-
642 628
       }
643
-      console.log(valueOne)
644
-      console.log(valueTwo)
645
-      console.log(valueThree)
646
-      console.log(valueFour)
647
-      console.log(valueSix)
648
-
649
-      value = ((valueOne - valueTwo) / valueOne) * 100
629
+      if(valueOne.length == 0){
630
+        this.$message.error("透析前尿素氮不能为空")
631
+        return
632
+      }
633
+      if(valueTwo.length == 0){
634
+        this.$message.error("透析后尿素氮不能为空")
635
+        return
636
+      }
637
+      value = (((valueOne - valueTwo) / valueOne) * 100).toFixed(2)
650 638
       for(let i = 0; i < items.length; i++){
651 639
         if(items[i].item_name == "URR(%)"){
652 640
           items[i].value = value
@@ -658,7 +646,6 @@ export default {
658 646
       let valueTwo = 0
659 647
       let valueThree = 0
660 648
       let valueFour = 0
661
-      let valueFive = 0
662 649
       let valueSix = 0
663 650
       for(let i = 0; i < items.length; i++){
664 651
         if(items[i].item_name == "透析前尿素氮"){
@@ -676,18 +663,37 @@ export default {
676 663
           valueFour = items[i].value
677 664
 
678 665
         }
679
-        if(items[i].item_name == "透前体重"){
680
-          valueFive = items[i].value
681
-        }
666
+
682 667
 
683 668
         if(items[i].item_name == "透后体重"){
684 669
           valueSix = items[i].value
685 670
         }
686 671
 
687 672
       }
688
-      value = ((valueTwo/valueOne - (0.008 * valueThree)) + (4 - (3.5 * (valueTwo / valueOne)))  * ((valueSix - valueFive) / valueSix)).toFixed(2)
689 673
 
690 674
 
675
+      if(valueOne.length == 0){
676
+        this.$message.error("透析前尿素氮不能为空")
677
+        return
678
+      }
679
+      if(valueTwo.length == 0){
680
+        this.$message.error("透析后尿素氮不能为空")
681
+        return
682
+      }
683
+      if(valueThree.length == 0){
684
+        this.$message.error("透析时间不能为空")
685
+        return
686
+      }
687
+      if(valueFour.length == 0){
688
+        this.$message.error("实际超滤量不能为空")
689
+        return
690
+      }
691
+
692
+      if(valueSix.length == 0){
693
+        this.$message.error("透后体重不能为空")
694
+        return
695
+      }
696
+      value = ((-Math.log((valueTwo /valueOne - (0.008 * valueThree)))) +  (4-3.5*(valueTwo/valueOne)) * valueFour/valueSix).toFixed(5)
691 697
 
692 698
       for(let i = 0; i < items.length; i++){
693 699
         if(items[i].item_name == "KT/V"){
@@ -777,6 +783,9 @@ export default {
777 783
       })
778 784
     },
779 785
     submitNew(formName) {
786
+
787
+
788
+
780 789
       this.$refs[formName].validate(valid => {
781 790
         if (valid) {
782 791
           this.formLoading = true