Merge branch 'master' into 'master'

科室核算汇总增加门诊以及全院医保收入分析增加工伤

See merge request lighter/vue-intergration-platform!101

src/views/medical-insurance/allpatient/InsurIncomeAnalysis.vue

@@ -57,7 +57,7 @@
               <el-table-column fixed label="姓名" prop="psnName" width="60"></el-table-column>
               <el-table-column fixed label="住院号" prop="patNo" width="70"></el-table-column>
               <el-table-column label="次数" prop="times" width="40"></el-table-column>
-              <el-table-column label="科室" prop="psnCertType" width="100"></el-table-column>
+              <el-table-column label="科室" prop="dept" width="100"></el-table-column>
               <el-table-column label="性别" prop="gendName" width="50"></el-table-column>
               <el-table-column label="出生日期" prop="brdy"></el-table-column>
               <el-table-column label="身份证" prop="certno"></el-table-column>
@@ -82,6 +82,7 @@
               <el-table-column label="中成药费" prop="chargePatentMedicine"></el-table-column>
               <el-table-column label="中药饮片费" prop="chargeHerbal"></el-table-column>
               <el-table-column label="耗材费" prop="chargeSanitaryMaterial"></el-table-column>
+              <el-table-column label="伙食费" prop="mealsFee"></el-table-column>
             </el-table>
             <el-pagination :current-page="currentPage" :page-size="pageSize" :page-sizes="[15, 30, 45, 60]"
                            :total="setldetails.length" layout="total, sizes, prev, pager, next, jumper" style="margin-top: 5px"
@@ -386,13 +387,13 @@ export default {
       let selectInfo = clone(setlCondition)
       selectInfo.insurType = row.insurType
       selectYbStatDetail(selectInfo)
-        .then((res) => {
-          setldetails.value = res
-          showSetldetails.value = true
-        })
-        .catch(() => {
-          setldetails.value = []
-        })
+          .then((res) => {
+            setldetails.value = res
+            showSetldetails.value = true
+          })
+          .catch(() => {
+            setldetails.value = []
+          })
     }
 
     const filterDialogTitle = computed(() => {
@@ -485,7 +486,7 @@ export default {
         const title = {
           patNo: '住院号',
           times: '住院次数',
-          psnCertType: '科室',
+          dept: '科室',
           psnName: '姓名',
           gendName: '性别',
           brdy: '出生日期',
@@ -511,6 +512,7 @@ export default {
           chargePatentMedicine: '中成药费',
           chargeHerbal: '中药饮片费',
           chargeSanitaryMaterial: '耗材费',
+          mealsFee: '伙食费',
         }
         Export(setldetails.value, title, filterDialogTitle.value)
       }
@@ -1281,6 +1283,10 @@ function initInsurOptions() {
           value: 4399012102,
           label: '省内单病种',
         },
+        {
+          value: 431321410,
+          label: '住院工伤',
+        },
       ],
     },
     {
@@ -1303,6 +1309,10 @@ function initInsurOptions() {
           value: 51,
           label: '生育门诊',
         },
+        {
+          value: 98,
+          label: '工伤门诊',
+        },
       ],
     },
   ]

src/views/operate-monitoring/InpatientDeptAccountingReport.vue

@@ -10,8 +10,10 @@
       :default-time="defaultTime2"
   />
   <el-select v-model="type" style="width: 200px; margin-left: 5px">
-    <el-option label="执行科室核算汇总" value="1"></el-option>
-    <el-option label="申请科室核算汇总" value="2"></el-option>
+    <el-option label="住院执行科室核算汇总" value="1"></el-option>
+    <el-option label="住院申请科室核算汇总" value="2"></el-option>
+    <el-option label="门诊执行科室核算汇总" value="3"></el-option>
+    <el-option label="门诊申请科室核算汇总" value="4"></el-option>
   </el-select>
   <el-button type="primary" icon="Search" @click="queryData" style="margin-left: 5px">查询</el-button>
   <el-button type="primary" icon="Download" @click="exportData" style="margin-left: 5px">导出</el-button>
@@ -21,9 +23,12 @@
     <div class="layout_main layout_el-table">
       <el-table :data="returnData.data" :span-method="objectSpanMethod" :row-style="rowStyle"
                 height="100%" highlight-current-row border stripe>
-        <el-table-column type="index" label="序号" align="center"></el-table-column>
+        <el-table-column type="index" label="序号" align="center" fixed></el-table-column>
         <template v-for="col in returnData.headList">
-          <el-table-column :prop="col.name" :label="col.display" :width="col.width" :align="col.align"
+          <el-table-column v-if="(col.name === 'hsm' || col.name === 'flm')" :prop="col.name" :label="col.display" :width="col.width" :align="col.align"
+                           show-overflow-tooltip fixed>
+          </el-table-column>
+          <el-table-column v-else :prop="col.name" :label="col.display" :width="col.width" :align="col.align"
                            show-overflow-tooltip>
           </el-table-column>
         </template>
@@ -93,10 +98,14 @@ const exportData = () => {
   let t
   if(type.value === "1") {
     t = "泰和医院住院执行科室核算收入报表"
-  } else {
+  } else if(type.value === "2") {
     t = "泰和医院住院申请科室核算收入报表"
+  } else if(type.value === "3") {
+    t = "泰和医院门诊执行科室核算收入报表"
+  } else if(type.value === "4") {
+    t = "泰和医院门诊申请科室核算收入报表"
   }
-  // 导出excel表格标题
+      // 导出excel表格标题
   queryTerm.exportName = t;
   exportInpatientDeptAccountingReport(queryTerm)
 }