1111

src/xt_pages/outpatientTool/components/allgather.vue

@@ -179,7 +179,7 @@ export default {
             let price = 0
             for (let d = 0; d < tempPatientsTwo.length; d++) {
               if (tempPatientsTwo[d].cost_classify == infos[e].cost_classify) {
-                price = parseFloat(price.toString()) + parseFloat((parseFloat(tempPatientsTwo[d].cnt.toString()) * parseFloat(tempPatientsTwo[d].pric.toString()).toFixed(2)).toString())
+                price = parseFloat(price.toString()) + parseFloat((tempPatientsTwo[d].det_item_fee_sumamt))
               }
               obj.price = price
             }

src/xt_pages/outpatientTool/components/settle.vue

@@ -408,41 +408,45 @@ import { uParseTime } from '@/utils/tools'
       },getTypeName(row){
         let name = ""
         if(row.insutype == '390'){
-          // let c =  this.config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
-          let a =  this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
-
           let e =  this.config.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
-
-
           let f=  row.his.insuplc_admdvs.slice(0, 2); //参保地前4位编码
-
-          // let d=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
           let b=  row.his.insuplc_admdvs.slice(0, 3); //参保地前3位编码
-          if(a == b){
-              name = "本地城乡"
-          }else{
-            if(e == f){
+          let a =  this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+          let c =  this.config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+          let k=  row.his.insuplc_admdvs.slice(0, 4); //参保地前3位编码
+          if (e == f) {
+            if (a == b) {
+              if (c ==k) {
+                name = "本地城乡"
+              } else {
+                name = "省内异地城乡"
+              }
+            } else {
               name = "省内异地城乡"
-            }else{
-              name = "省外异地城乡"
             }
+          } else {
+            name = "省外异地城乡"
           }
 
         }else if(row.insutype == '310'){
-          // let c =  this.config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
-          let a = this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
           let e =  this.config.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
           let f=  row.his.insuplc_admdvs.slice(0, 2); //参保地前4位编码
-          // let d=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
           let b=  row.his.insuplc_admdvs.slice(0, 3); //参保地前3位编码
-          if(a == b){
-            name = "本地职工"
-          }else{
-            if (e == f){
+          let a =  this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+          let c =  this.config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+          let k=  row.his.insuplc_admdvs.slice(0, 4); //参保地前3位编码
+          if (e == f) {
+            if (a == b) {
+              if (c == k) {
+                name = "本地职工"
+              } else {
+                name = "省内异地职工"
+              }
+            } else {
               name = "省内异地职工"
-            }else{
-              name = "省外异地职工"
             }
+          } else {
+            name = "省外异地职工"
           }
         }else{
           name = "其他"

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -23,8 +23,9 @@
          <div class="listInfo" style="border-bottom: 2px solid;margin-bottom: 20px;padding-bottom: 20px;">
             <div>预交款：</div>
             <div>总费用：{{getAllPice()}}</div>
-           <div v-if=" this.$store.getters.xt_user.org_id != 10387">门诊日期：{{this.$route.query.end_time}}</div>
+           <div v-if=" this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 9478 && this.$store.getters.xt_user.org_id != 0">门诊日期：{{this.$route.query.end_time}}</div>
            <div v-if=" this.$store.getters.xt_user.org_id == 10387">门诊日期：{{this.$route.query.start_time}} ~ {{this.$route.query.end_time}}</div>
+           <div v-if=" this.$store.getters.xt_user.org_id == 9478 || this.$store.getters.xt_user.org_id == 0">门诊日期：{{getData()}}</div>
 
         </div>
         <div class="listInfo">
@@ -148,6 +149,7 @@
           orderList:[],
           org_id:0,
           list:[],
+          datas:[],
         }
     },
     methods:{
@@ -200,7 +202,12 @@
           var list = response.data.data.list
           this.list = list
           this.orderList = response.data.data.orderList
-          console.log("orderlist23323223",this.orderList)
+
+
+            for(let i = 0; i < this.orderList.length; i++){
+              this.datas.push(this.orderList[i].settle_accounts_date)
+            }
+
           var new_arr = []
 
           for(let i=0;i<list.length;i++){
@@ -607,6 +614,17 @@
 
         }
 
+      }, findMinMax(arr) {
+          if (arr.length === 0) return { min: null, max: null };
+          const sorted = [...arr].sort((a, b) => a.timestamp - b.timestamp);
+          return { max: sorted[sorted.length - 1], min: sorted[0] };
+        },getData(){
+        const result = this.findMinMax(this.datas);
+        console.log('最大:', result.max); // { id: 3, timestamp: 1629466000000 }
+        console.log('最小:', result.min);
+
+        return this.getTimes( result.min) + "~" + this.getTimes( result.max)
+
       },
        getType(med_chrgitm_type){
         switch (med_chrgitm_type) {