提交代码

src/xt_pages/hospitalStation/doctorDesk.vue

                 var preTime = ''
 
                 if (prescription.pre_time == 0) {
-                  if (this.schedule.schedule_type == 1) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                  } else if (this.schedule.schedule_type == 2) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                  } else if (this.schedule.schedule_type == 3) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                  if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
+                    if (this.schedule.schedule_type == 1) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                    } else if (this.schedule.schedule_type == 2) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    } else if (this.schedule.schedule_type == 3) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    }
+                  }else{
+                    preTime = ""
                   }
-                  // preTime = nowTime
                 } else {
-                  preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                  if (this.$store.getters.xt_user.org.id != 10210  || this.$store.getters.xt_user.org.id != 0){
+                    preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                  }else{
+                    preTime = ""
+                  }
                 }
 
                 let index = i + 1

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:190px;left:50px"></div>
             <div style="position: absolute;top:190px;left:130px"></div>
-            <div style="position: absolute;top:190px;left:180px"></div>
-            <div style="position: absolute;top:190px;left:260px"></div>
+            <div style="position: absolute;top:190px;left:180px">诊察费</div>
+            <div style="position: absolute;top:190px;left:260px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
             <div style="position: absolute;top:190px;left:340px">材料费</div>
             <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
             <div style="position: absolute;top:190px;left:480px"></div>
                 console.log('res',res)
                 this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
                 if(this.totalPrice == 0){
 
                   this.totalPrice = this.list.medfee_sumamt

src/xt_pages/outpatientCharges/summary.vue

           <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>
           <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>
 
-          <!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
+<!--                    <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
 
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
           <!--          </el-button-->
           <!--          >-->
 
-                              <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
-          <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
-          <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-<!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
-<!--          <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
-
-          <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
+<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
+          <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
 
         </div>
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "03",
+                month: "04",
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,

src/xt_pages/outpatientTool/components/detail.vue

 
             <el-table-column align="center" prop="total" label="费用总额">
                 <template slot-scope="scope">
-                    <div>{{scope.row.total}}</div>
+                    <div>{{scope.row.total.toFixed(2)}}</div>
                 </template>
             </el-table-column>
 
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
                 if (new_name != undefined){
                   if (new_name.length != 0) {
-                    console.log(total)
-                    console.log(tempPatientsTwo[i].new_order_info[b].item_total)
-
-                    total = parseFloat(total) + parseFloat(tempPatientsTwo[i].new_order_info[b].item_total).toFixed(2)
+                    total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString())).toFixed(2))
                   }
 
 

src/xt_pages/user/ktv.vue

               <el-form-item
                 :label="item.item_name"
                 :key="item.item_id"
+                :rules="item.item_name != 'URR(%)'?[
+                { required: true, message: '请输入数值', trigger: 'blur' }
+              ]:[]"
                 :prop="'formItem.' + index + '.value'"
               >
                 <el-input
     calURR(items, value){
       let valueOne = 0
       let valueTwo = 0
-      let valueThree = 0
-      let valueFour = 0
-      let valueSix = 0
 
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "透析前尿素氮"){
-
           valueOne = items[i].value
         }
         if(items[i].item_name == "透析后尿素氮"){
           valueTwo = items[i].value
         }
-        if(items[i].item_name == "透析时间"){
-
-          valueThree = items[i].value
-
-        }
-        if(items[i].item_name == "实际超滤量"){
-          valueFour = items[i].value
-
-        }
-        if(items[i].item_name == "透后体重"){
-          valueSix = items[i].value
-        }
-
       }
-      console.log(valueOne)
-      console.log(valueTwo)
-      console.log(valueThree)
-      console.log(valueFour)
-      console.log(valueSix)
-
-      value = ((valueOne - valueTwo) / valueOne) * 100
+      if(valueOne.length == 0){
+        this.$message.error("透析前尿素氮不能为空")
+        return
+      }
+      if(valueTwo.length == 0){
+        this.$message.error("透析后尿素氮不能为空")
+        return
+      }
+      value = (((valueOne - valueTwo) / valueOne) * 100).toFixed(2)
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "URR(%)"){
           items[i].value = value
       let valueTwo = 0
       let valueThree = 0
       let valueFour = 0
-      let valueFive = 0
       let valueSix = 0
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "透析前尿素氮"){
           valueFour = items[i].value
 
         }
-        if(items[i].item_name == "透前体重"){
-          valueFive = items[i].value
-        }
+
 
         if(items[i].item_name == "透后体重"){
           valueSix = items[i].value
         }
 
       }
-      value = ((valueTwo/valueOne - (0.008 * valueThree)) + (4 - (3.5 * (valueTwo / valueOne)))  * ((valueSix - valueFive) / valueSix)).toFixed(2)
 
 
+      if(valueOne.length == 0){
+        this.$message.error("透析前尿素氮不能为空")
+        return
+      }
+      if(valueTwo.length == 0){
+        this.$message.error("透析后尿素氮不能为空")
+        return
+      }
+      if(valueThree.length == 0){
+        this.$message.error("透析时间不能为空")
+        return
+      }
+      if(valueFour.length == 0){
+        this.$message.error("实际超滤量不能为空")
+        return
+      }
+
+      if(valueSix.length == 0){
+        this.$message.error("透后体重不能为空")
+        return
+      }
+      value = ((-Math.log((valueTwo /valueOne - (0.008 * valueThree)))) +  (4-3.5*(valueTwo/valueOne)) * valueFour/valueSix).toFixed(5)
 
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "KT/V"){
       })
     },
     submitNew(formName) {
+
+
+
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formLoading = true