上传信息,增加去重,增加科室,结算单列表查询条件增加姓名查询

src/components/si-sheet-upload/ExportAutoUploadInfo.vue

@@ -1,10 +1,16 @@
 <template>
     <page-layer>
     <template #header>
+        <el-select v-model="queryuploadTerm.zhuYuanFlag" placeholder="住院类型" style="width: 110px">
+            <el-option label="住院" value="0" />
+            <el-option label="门诊" value="1" />
+        </el-select>
           <el-input v-model="queryuploadTerm.patNo" clearable placeholder="住院号"
                     @blur="patNo = $event.target.value.trim()" @keyup.enter="queryPage" style="width: 110px"></el-input>
         <el-input v-model="queryuploadTerm.times" clearable placeholder="住院次数"
-                  @blur="times = $event.target.value.trim()"  style="width: 80px"></el-input>
+                  @blur="times = $event.target.value.trim()"  style="width: 70px"></el-input>
+        <el-input v-model="queryuploadTerm.ledgerSn" clearable placeholder="账页号"
+                  @blur="times = $event.target.value.trim()"  style="width: 60px"></el-input>
           <el-select v-model="queryuploadTerm.typeFlag" placeholder="上传类型" style="width: 110px">
             <el-option label="全部" value="0" />
             <el-option label="自动上传" value="1" />
@@ -15,6 +21,14 @@
             <el-option label="上传成功" value="1" />
             <el-option label="上传失败" value="2" />
           </el-select>
+        <el-select v-model="queryuploadTerm.outDeptList" :collapse-tags="true" clearable filterable multiple
+                   placeholder="出院科室">
+            <el-option v-for="item in disDepts" :key="item.code" :label="item.name" :value="item.code">
+                <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+                <el-divider direction="vertical"></el-divider>
+                <span>{{ item.name }}</span>
+            </el-option>
+        </el-select>
             <span>上传时间</span>
           <el-date-picker
                   v-model="queryuploadTerm.uploadDateRange"
@@ -41,6 +55,10 @@
                   style="width: 180px"
                   value-format="YYYY-MM-DD"
           />
+        <el-select v-model="queryuploadTerm.distinctFlag" placeholder="是否去重" style="width: 110px">
+            <el-option label="全部" value="0" />
+            <el-option label="去重" value="1" />
+        </el-select>
           <el-button icon="Search"  type="primary" @click="queryPage">查询</el-button>
           <el-button type="primary" @click="ExportToExcel">导出Excel</el-button>
     </template>
@@ -49,6 +67,7 @@
         <el-table-column prop="patNo" label="住院号" width="80"></el-table-column>
         <el-table-column prop="times" label="住院次数" width="80"></el-table-column>
         <el-table-column prop="ledgerSn" label="账页号" width="80"></el-table-column>
+        <el-table-column prop="outDeptName" label="出院科室" width="80"></el-table-column>
         <el-table-column prop="typeFlagName" label="上传类型" width="80"></el-table-column>
         <el-table-column prop="uploadName" label="上传人" width="80"></el-table-column>
         <el-table-column prop="flagName" label="上传结果标识" width="90"></el-table-column>
@@ -72,7 +91,7 @@
 <script setup name='ExportAutoUploadInfo'>
 import {clockinShortcuts} from '@/data/shortcuts'
 import {onMounted,ref,onActivated} from "vue";
-import {getServerDateApi} from "@/api/public-api";
+import {getServerDateApi,getZhuYuanDept} from "@/api/public-api";
 import moment from "moment";
 import {getDateRangeFormatDate} from "@/utils/date";
 import {downloadExcel} from "@/utils/excel";
@@ -90,6 +109,7 @@ const emit = defineEmits(['close'])
 const dialog = ref(true)
 const uploadInfoData = ref([])
 const  queryuploadTerm = ref({
+  zhuYuanFlag:"",
   patNo:"",
   times:null,
   ledgerSn:null,
@@ -104,6 +124,8 @@ const  queryuploadTerm = ref({
   currentPage:1,
   pageSize:40,
   list:[],
+  outDeptList:[],
+  distinctFlag: '0',
   total: 0
 })
 
@@ -149,8 +171,13 @@ onActivated(async () => {
     await queryPage()
 })
 
-onMounted( () => {
+// 出院科室
+const disDepts = ref([])
 
+onMounted( () => {
+    getZhuYuanDept().then((res) => {
+        disDepts.value = res
+    })
 })
 
 const handleSizeChange = (val) => {

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

@@ -305,6 +305,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="spanWidth">
+              <el-form-item label="姓名" prop="name">
+                <el-input v-model="queryTerm.name" clearable placeholder="姓名" style="width: 120px"
+                          @blur="patNo = $event.target.value.trim()" @keyup.enter="query"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <el-button icon="Search" size="small" type="primary" @click="query">查询</el-button>
@@ -431,6 +437,7 @@ export default {
       times:null,
       uploadJieZhiDay:[],
       ybSf:null,
+      name:''
     })
     const dept = store.state.user.info.deptCode
     // 表单