Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/hospitalStation/invoiceTemplate/printfour.vue

@@ -24,7 +24,7 @@
           <div style="width: 300px;"></div>
       </div>
       <div style="display:flex;margin-top: 30px;">
-        <div style="width: 150px;">床位费 {{ list.bedCostTotal ? list.bedCostTotal :'0' }}</div>
+        <div style="width: 150px;">床位费 {{ list.bedCostTotal}}</div>
         <div style="width: 150px;margin:0 30px;">治疗费 {{ list.treatCostTotal ? list.treatCostTotal :'0'}}</div>
         <div style="width: 150px;margin:0 30px;">西药费 {{ list.westernMedicineCostTotal }}</div>
         <div style="width: 150px;margin:0 30px;">
@@ -55,7 +55,7 @@
           </div>
           <div style="width: 230px;margin-left: 20px;">
             自费费用:
-            {{ list.order.psn_cash_pay?list.order.psn_cash_pay:'0' }}
+            {{ list.order.fulamt_ownpay_amt?list.order.fulamt_ownpay_amt:'0' }}
           </div>
           <div style="width: 230px;margin-left: 20px;">医院优惠: 0</div>
         </div>
@@ -180,7 +180,7 @@ export default {
         }
         return "";
       },
-      
+
       getDay(dateString1,dateString2){
         var  startDate = Date.parse(dateString1);
         var  endDate = Date.parse(dateString2);

src/xt_pages/hospitalStation/summary.vue

@@ -1138,6 +1138,7 @@ export default {
               就诊id: number,
               登记日期: order.his_hospital_patient.in_hosptial_time,
               出院日期: order.his_hospital_patient.out_hosptial_time,
+              出院诊断疾病名称: '慢性肾病5期血液透析状态',
               结算id: order.setl_id,
               结算日期: order.setl_time,
               医疗费总额: order.medfee_sumamt,
@@ -1176,6 +1177,7 @@ export default {
               "就诊id",
               "登记日期",
               "出院日期",
+              "出院诊断疾病名称",
               "结算id",
               "结算日期",
               "医疗费总额",
@@ -1211,6 +1213,7 @@ export default {
               "就诊id",
               "登记日期",
               "出院日期",
+              "出院诊断疾病名称",
               "结算id",
               "结算日期",
               "医疗费总额",

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -13,7 +13,7 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215 && org_id !=0 && org_id !=9671&&org_id !=9675&& org_id !=10515" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
       <printTwo v-if="org_id==10515 || org_id==0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
@@ -58,7 +58,8 @@
     methods: {
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
-      }, getInfo(order_id) {
+      }, 
+      getInfo(order_id) {
         let params = {
           id: order_id
         }
@@ -79,13 +80,13 @@
             this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
             this.order['treatCostTotal'] = response.data.data.treatCostTotal
 
-            console.log("~~~~~")
+            console.log("~~~~~",response.data.data)
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
 
-            if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
+            if(this.$store.getters.xt_user.org_id == 10215){
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
               for (let i = 0; i < order_info.length; i++) {
@@ -111,14 +112,14 @@
                     tempDetails.push(order_info[b])
                   }
                 }
-                console.log("～～～～～～～～")
-                console.log(tempDetails)
+                // console.log("～～～～～～～～")
+                // console.log(tempDetails)
 
-                console.log("1111="+tempDetails)
+                // console.log("1111="+tempDetails)
                 obj.details = this.setNewData(tempDetails)
-                console.log("22222="+obj.details)
+                // console.log("22222="+obj.details)
                 this.list =  this.list.concat(obj.details)
-                console.log("222233332="+ this.list)
+                console.log("222233332=",this.list)
               }
               let newobj = {}
               newobj['total'] = this.order.medfee_sumamt
@@ -127,7 +128,43 @@
             }else{
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
+              let chrgitm_lvs = []
+              let advice = []
+              let good = []
+              let project = []
               for (let i = 0; i < order_info.length; i++) {
+                if(order_info[i].advice.advice_name !=''){
+                  const adv={
+                    advice_name:order_info[i].advice.advice_name,
+                    // good_name:order_info[i].project.good_info.good_name,
+                    // project_name:order_info[i].project.project.project_name,
+                    chrgitm_lv:order_info[i].chrgitm_lv,
+                  }
+                  advice.push(adv)
+                }
+               
+                if(order_info[i].project.good_info.good_name !=''){
+                  const god={
+                    // advice_name:order_info[i].advice.advice_name,
+                    good_name:order_info[i].project.good_info.good_name,
+                    // project_name:order_info[i].project.project.project_name,
+                    chrgitm_lv:order_info[i].chrgitm_lv,
+                  }
+                  good.push(god)
+                }
+
+                if(order_info[i].project.project.project_name !=''){
+                  const pro={
+                    // advice_name:order_info[i].advice.advice_name,
+                    // good_name:order_info[i].project.good_info.good_name,
+                    project_name:order_info[i].project.project.project_name,
+                    chrgitm_lv:order_info[i].chrgitm_lv,
+                  }
+                  project.push(pro)
+                }
+
+                // chrgitm_lvs.push(arr)
+                // chrgitm_lvs.push(order_info[i].chrgitm_lv)
                 med_chrgitm_types.push(order_info[i].med_chrgitm_type)
               }
               const obj = {}
@@ -153,13 +190,68 @@
                   total: obj.total,
                   is_total: 1,
                 })
-                console.log("23323223323232332323322332",obj.details)
+                // console.log("23323223323232332323322332",obj.details)
                 this.list =  this.list.concat(obj.details)
+                // console.log("23323223323232332323322332",this.list)
+              }
+              for(let i=0;i<advice.length;i++){
+                for(let j=i+1;j<advice.length;j++){
+                  if(advice[i].advice_name == advice[j].advice_name){
+                    advice.splice(j,1)
+                    j--
+                  }
+                }
               }
+              for(let i=0;i<good.length;i++){
+                for(let j=i+1;j<good.length;j++){
+                  if(good[i].good_name == good[j].good_name){
+                    good.splice(j,1)
+                    j--
+                  }
+                }
+              }
+              for(let i=0;i<project.length;i++){
+                for(let j=i+1;j<project.length;j++){
+                  if(project[i].project_name == project[j].project_name){
+                    project.splice(j,1)
+                    j--
+                  }
+                }
+              }
+
+              chrgitm_lvs = [...advice,...good,...project]
+              
+              console.log('yyyyyyyyyyyy',chrgitm_lvs);
+              for(let i in this.list){
+                for(let j in chrgitm_lvs){
+                  if(this.list[i].is_total ==2){
+                    if(this.list[i].name == chrgitm_lvs[j].advice_name ||
+                        this.list[i].name == chrgitm_lvs[j].good_name ||
+                        this.list[i].name == chrgitm_lvs[j].project_name
+                    ){
+                      this.list[i]['chrgitm_lv'] = chrgitm_lvs[j].chrgitm_lv
+                    }
+                  }
+                }
+              }
+              console.log('tttttttttttt',this.list);
             }
           }
         })
-      }, getTotal:function(items){
+        
+      }, 
+      getquchong(arr){
+        for(let i=0;i<arr.length;i++){
+          for(let j=i+1;j<arr.length;j++){
+            if(arr[i] == arr[j]){
+              arr.splice(j,1)
+              j--
+            }
+          }
+        }
+        return arr
+      },
+      getTotal:function(items){
         let total = 0
         for(let i = 0; i < items.length; i++){
           total = Number(total) + Number((parseFloat(items[i].count) * parseFloat(items[i].price)).toFixed(2))

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -16,8 +16,9 @@
       <table class="allListTable" border="1">
         <tr>
           <td style="width:10%">类别</td>
-          <td style="width:50%">项目名称</td>
+          <td style="width:40%">项目名称</td>
           <td style="width:10%">规格</td>
+          <td style="width:10%" v-if="org_id==10489">报销等级</td>
           <td style="width:10%">单价(元)</td>
           <td style="width:10%">数量</td>
           <td style="width:10%">金额(元)</td>
@@ -25,8 +26,9 @@
         <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
           <tr v-if="item.is_total == 2">
             <td style="width:10%">{{ item.med_chrgitm_type }}</td>
-            <td style="width:50%">{{ item.name }}</td>
+            <td style="width:40%">{{ item.name }}</td>
             <td style="width:10%">{{ item.spec }}</td>
+            <td style="width:10%" v-if="org_id==10489">{{ getMedicineInsuranceType(item.chrgitm_lv) }}</td>
             <td style="width:10%">{{ (item.price).toFixed(2) }}</td>
             <td style="width:10%">{{ item.count }}{{ item.unit }}</td>
             <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
@@ -81,7 +83,8 @@ export default {
   data() {
     return {
       page: 1,
-      pageArr: []
+      pageArr: [],
+      org_id:'',
     }
   },
   methods: {
@@ -111,6 +114,7 @@ export default {
 
     },
     getPage() {
+      console.log('kkkkkk',this.list);
       if (this.list.length <= 13) {
         this.page = 1
         this.pageArr.push(this.list.length)
@@ -124,9 +128,28 @@ export default {
           this.pageArr.push(num)
         }
       }
-    }
+    },
+    getMedicineInsuranceType(type) {
+      switch (type) {
+        case "01":
+          return '甲类'
+          break
+        case "02":
+          return '乙类'
+
+          break
+        case "03":
+          return '自费'
+          break
+
+      }
+
+    },
 
   },
+  created(){
+    this.org_id = this.$store.getters.xt_user.org_id
+  },
   watch: {
     list: {
       handler(newVal) {

src/xt_pages/outpatientCharges/listPrint.vue

@@ -577,7 +577,7 @@
 
       printThisPage() {
         if(this.org_id != 10106){
-          if(this.org_id == 10215 || this.org_id == 9675 || this.org_id == 0 || this.org_id == 10485){
+          if(this.org_id == 10215 || this.org_id == 9675  || this.org_id == 10485){
             const style =
               '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -1,6 +1,6 @@
 <template>
     <div id="list-print" class="list-print">
-        <div v-for='(i,index) in pageArr.length' :key="index">
+        <div v-for='(i,index) in pageArr.length' :key="index" style="page-break-after: always;">
         <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
         <div class="listInfo">
 
@@ -29,7 +29,7 @@
 
 
             </tr>
-            <tr v-for="item in list.slice(index * 15,(index * 15) + pageArr[index])">
+            <tr v-for="item in list.slice(index * 16,(index * 16) + pageArr[index])">
                 <td style="width:15%">{{item.p_time}}</td>
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
                 <td style="width:10%">{{item.code}}</td>
@@ -39,7 +39,6 @@
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
               <td v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0 " style="width:10%">{{getMedicineInsuranceKind(item.type)}}</td>
-
             </tr>
         </table>
         <div class="tableBottom">
@@ -125,6 +124,7 @@
         return uParseTime(time, '{y}-{m}-{d}')
       },
       getPage(){
+
         if(this.list.length <= 16){
             this.page = 1
             this.pageArr.push(this.list.length)
@@ -138,6 +138,8 @@
                 this.pageArr.push(num)
             }
         }
+        console.log('this.list',this.list);
+        console.log('this.pageArr',this.pageArr);
       }
 
     },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -925,7 +925,6 @@
 
     <additionalCharges ref='additionalCharges' @click="addCharges"
                        :addtions_charge="addtions_charge"></additionalCharges>
-
     <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
                      v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
     <call-un-association-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-un-association-prescription>
@@ -1877,7 +1876,7 @@ export default {
             this.$refs.register.hide()
             this.loadingone = false
 
-            this.CheckHISPatient(this.record_date,this.patientInfo.id)
+            this.CheckHISPatient(this.record_date,forms.id)
 
           }
         })
@@ -1913,7 +1912,7 @@ export default {
                 that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
                 that.$refs.register.hide()
                 that.loadingone = false
-                that.CheckHISPatient(that.record_date,that.patientInfo.id)
+                that.CheckHISPatient(that.record_date,forms.id)
 
               }
             }

src/xt_pages/outpatientCharges/summary.vue

@@ -145,11 +145,11 @@
           <!--          </el-button-->
           <!--          >-->
 
-<!--          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
+          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</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">诊疗下载</el-button>-->
+<!--                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</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>-->
 
@@ -926,6 +926,12 @@ export default {
         case 21:
           return '普通住院'
           break
+        case 140104:
+          return '城乡门诊特殊病(140104)'
+          break
+        case 992102:
+          return '单病种(992102)'
+          break
       }
     },
     cancelUploadTwo(row) {
@@ -2022,7 +2028,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              '周期': '2023年第四季度',
+              '周期': '2024年第一季度',
               '类别': '门诊',
               '医保目录编码': list[i].code,
               '医保目录名称': list[i].name,
@@ -3462,7 +3468,7 @@ export default {
               实收金额: order.medfee_sumamt,
               医保统筹金额: order.hifp_pay,
               大额基金金额: order.hifob_pay,
-              大病基金金额: hifmi_pay,
+              大病基金金额: order.hifmi_pay,
               补充保险基金金额: order.hifes_pay,
               医疗救助基金金额: order.maf_pay,
               公务员基金: order.cvlserv_pay,
@@ -3680,7 +3686,7 @@ export default {
         let total = 0
 
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-          if (project_ids[i].price == project_month_prescriptions.project[a].project.price && project_ids[i].id == project_month_prescriptions.project[a].project.project_id) {
+          if (project_ids[i].price == project_month_prescriptions.project[a].pric && project_ids[i].id == project_month_prescriptions.project[a].project.project_id) {
 
             if (project_month_prescriptions.project[a].project.type == 2) {
               obj['name'] = project_month_prescriptions.project[a].project.project.project_name
@@ -3869,8 +3875,8 @@ export default {
       //   console.log('6666666',tableData);
       //   let arr = []
       //   for (let i = 0; i < tableData.length; i++) {
-          
-      //     if (tableData[i].patient.name.indexOf(this.keywords) != -1 || 
+
+      //     if (tableData[i].patient.name.indexOf(this.keywords) != -1 ||
       //       tableData[i].patient.first_letter.indexOf(this.keywords) != -1) {
       //       arr = arr.concat(tableData[i])
       //     }

src/xt_pages/outpatientTool/components/settle.vue

@@ -94,7 +94,8 @@
                   <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
                   <div v-if="scope.row.med_type == '11'">普通门诊</div>
                   <div v-if="scope.row.med_type == '1112'">普通门诊</div>
-
+                  <div v-if="scope.row.med_type == '140104'">城乡门诊特殊病(140104)</div>
+                  <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
               </template>
           </el-table-column>
           <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">