518合并代码

src/api/common/common.js

@@ -48,7 +48,6 @@ export function getConfigurationList(limit, page) {
 }
 
 export function getConfigurationDetail(id, params) {
-
   return request({
     url: 'com/api/getconfigurationdetail?id=' + id,
     method: 'get',
@@ -134,14 +133,13 @@ export function DeleteCheck(id, params) {
   })
 }
 
-export function getDialysisModeType(startime, endtime,lapsetotype,sourcetype) {
+export function getDialysisModeType(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
-  console.log("parasm22222",params)
   return request({
     url: '/com/api/getdialysismodetype',
     method: 'get',
@@ -149,12 +147,12 @@ export function getDialysisModeType(startime, endtime,lapsetotype,sourcetype) {
   })
 }
 
-export function getTotalLapseCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalLapseCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   console.log('转归params', params)
   return request({
@@ -164,12 +162,12 @@ export function getTotalLapseCount(startime, endtime,lapsetotype,sourcetype) {
   })
 }
 
-export function getTotalSexCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalSexCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   return request({
     url: '/com/api/gettotalsexcount',
@@ -178,12 +176,12 @@ export function getTotalSexCount(startime, endtime,lapsetotype,sourcetype) {
   })
 }
 
-export function getTotalInfectiousCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalInfectiousCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   console.log('传染病', params)
   return request({
@@ -193,12 +191,12 @@ export function getTotalInfectiousCount(startime, endtime,lapsetotype,sourcetype
   })
 }
 
-export function getTotalAgeCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalAgeCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   return request({
     url: '/com/api/gettotalagecount',
@@ -207,12 +205,12 @@ export function getTotalAgeCount(startime, endtime,lapsetotype,sourcetype) {
   })
 }
 
-export function getTotalDialysisCount(startime, endtime,lapsetotype,sourcetype) {
+export function getTotalDialysisCount(startime, endtime, lapsetotype, sourcetype) {
   const params = {
     startime: startime,
     endtime: endtime,
-    lapsetotype:lapsetotype,
-    sourcetype:sourcetype,
+    lapsetotype: lapsetotype,
+    sourcetype: sourcetype
   }
   return request({
     url: '/com/api/gettotaldialysiscount',
@@ -525,31 +523,28 @@ export function getIdSlist(data, patientid) {
   })
 }
 
-
-export function getTreatModeList(params){
-  console.log("params",params)
+export function getTreatModeList(params) {
+  console.log('params', params)
   return request({
-    url:"/com/api/getreatmodelist",
-    method:"get",
-    params:params,
+    url: '/com/api/getreatmodelist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getCountModeId(params){
+export function getCountModeId(params) {
   return request({
-    url:'/com/api/getcountmodeid',
-    method:"Get",
-    params:params
+    url: '/com/api/getcountmodeid',
+    method: 'Get',
+    params: params
   })
 }
 
-export function getRolloutCount(params){
-
+export function getRolloutCount(params) {
   return request({
-    url:"/com/api/getrolloutcount",
-    method:"Get",
-    params:params
+    url: '/com/api/getrolloutcount',
+    method: 'Get',
+    params: params
   })
 }
 
-

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2162,7 +2162,7 @@
         if (val > 2) {
           this.anticoagulant = this.anticoagulantsConfit[thismode - 2]
         }
-        if ((this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 41 || this.$store.getters.xt_user.template_info.template_id == 6) && val == 2) {
+        if ((this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 41 || this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 47) && val == 2) {
            if(val == 2){
              this.anticoagulant.shouji_unit = 'mg'
            }else{

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -344,7 +344,7 @@ export default {
       for(let i=0;i<this.orderList.length;i++){
          act_pay += this.orderList[i].psn_part_amt
       }
-      return act_pay
+      return act_pay.toFixed(2)
     },
     getFundPaySumamt(){
       var fund_pay_sumamt = 0

src/xt_pages/outpatientTool/detailPrint.vue

@@ -353,7 +353,7 @@ export default {
       for(let i=0;i<this.orderList.length;i++){
          act_pay += this.orderList[i].psn_part_amt
       }
-      return act_pay
+      return act_pay.toFixed(2)
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;