Merge branch 'master' into 淮海科技

.gitignore

@@ -29,3 +29,4 @@ webstorm.config.js
 src/views/settings/Test.vue
 dist/
 pnpm-lock.yaml
+*.mjs

src/components/cy/yf-group/YfGrouo.vue

@@ -15,7 +15,6 @@ const props = withDefaults(
 );
 
 const emits = defineEmits(["update:modelValue"]);
-
 const value = defineModel();
 
 const data = computed(() => {

src/components/medical-insurance/registinfo/Index.vue

@@ -103,7 +103,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template #label> 医疗类别 </template>
-            {{ cptMedType(registerInfo.medType) }}
+            {{ registerInfo.medTypeName }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template #label> 异地标志 </template>
@@ -130,7 +130,7 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import { queryInHospitalPatientsInfo } from '@/api/medical-insurance/si-query'
-import { cptSex, cptPsnCertType, cptInsutype, cptMedType, cptYesOrNo } from '@/utils/computed'
+import { cptSex, cptPsnCertType, cptInsutype, cptYesOrNo } from '@/utils/computed'
 import {useMedinsStore} from "@/pinia/medins-store";
 
 const props = defineProps({

src/components/xmlr/components/projectInput/FeeInput.vue

@@ -19,6 +19,7 @@ import { xcMessage } from "@/utils/xiaochan-element-plus";
 import ScanCodeGun from "@/components/xmlr/dialog/ScanCodeGun.vue";
 import { isDev, needRule, ruleName } from "@/utils/public";
 import { magicApi } from "@/utils/database/magic-api-request";
+import dayjs from "dayjs";
 
 const { saveData, saveProxy, store, muBanRef, medicalTechnology } = inject(
   key
@@ -74,7 +75,7 @@ function handleSave() {
     orderNo: medicalTechnology ? 3 : 0,
     ledgerSn: store.patInfo.ledgerSn,
     receiptNo: receiptNo.value,
-    chargeDate: store.chargeDate,
+    chargeDate: dayjs(store.chargeDate).format("YYYY-MM-DD hh:mm:ss"),
   };
 
   if (needRule(ruleName.财务)) {

src/components/xmlr/index.ts

@@ -15,6 +15,7 @@ import {
   getFrequency,
   getSupplyType,
 } from "@/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
+import dayjs from "dayjs";
 
 type PatInfo = {
   name?: string;
@@ -103,7 +104,9 @@ export const useXmlr = (props: XmlrProps, emits: UseDialogType.Emits) => {
             })
             .catch(() => {
               //@ts-ignore
-              store.chargeDate = new Date();
+              store.chargeDate = dayjs(new Date()).format(
+                "YYYY-MM-DD hh:mm:ss"
+              );
             });
           return res;
         })

src/views/crb-manage/CrbBaseInfo.vue

@@ -97,7 +97,6 @@ import {
   uploadBaseUserData
 } from "@/api/crb-manage/crb-base-info.js";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {updateMzDrugCodgData} from "@/api/yp-codg/yp-codg-match.js";
 
 const codeRs = ref('')
 const xm = ref('')

src/views/operate-monitoring/MzYsOperateDynamics.vue

@@ -94,8 +94,12 @@ const queryTerm = reactive({
   type: "1",
 });
 
-const dept = ref([])
-const doctor = ref([])
+const dept = ref('')
+const doctor = ref('')
+const deptOptions = ref([])
+const doctorOptions = ref([])
+const loadingDept = ref(false)
+const loadingDoctor = ref(false)
 
 onMounted(() => {
   queryTerm.startTime = start + '00:00:00';
@@ -112,10 +116,6 @@ onMounted(() => {
   })
 });
 
-const deptOptions = ref([])
-const doctorOptions = ref([])
-const loadingDept = ref(false)
-const loadingDoctor = ref(false)
 const selectDeptMultiple = (ks) => {
   if (ks) {
     loadingDept.value = true
@@ -123,19 +123,9 @@ const selectDeptMultiple = (ks) => {
       str: ks,
     }
     selectAllSmallDept(param).then((res) => {
+      loadingDept.value = false
       deptOptions.value = res
     })
-
-    if (deptOptions.value) {
-      setTimeout(() => {
-        loadingDept.value = false
-        dept.value = deptOptions.value.filter((item) => {
-          return item.label.toLowerCase().includes(ks.toLowerCase())
-        })
-      }, 1000)
-    } else {
-      deptOptions.value = []
-    }
   } else {
     deptOptions.value = []
   }
@@ -150,18 +140,9 @@ const selectDoctorMultiple = (ys) => {
       dept: d,
     }
     selectAllDoctor(paramF).then((res) => {
+      loadingDoctor.value = false
       doctorOptions.value = res
     })
-    if (doctorOptions.value) {
-      setTimeout(() => {
-        loadingDoctor.value = false
-        doctor.value = doctorOptions.value.filter((item) => {
-          return item.label.toLowerCase().includes(ys.toLowerCase())
-        })
-      }, 1000)
-    } else {
-      doctorOptions.value = []
-    }
   } else {
     doctorOptions.value = []
   }

src/views/operate-monitoring/ReceivePatients.vue

@@ -76,7 +76,7 @@ import { shortcuts, clockinShortcuts } from '@/data/shortcuts'
 import { formatDate, getDateRangeFormatDate } from '@/utils/date'
 import { ElMessage } from 'element-plus'
 import { selectReportPortalMenu, exportReportPortalData } from '@/api/reports/high-report'
-import { selectAllSmallDept, selectAllDoctor, selectAllRegLevel } from '@/api/medical-insurance/si-yb-util'
+import {selectAllSmallDept, selectAllDoctor, selectAllRegLevel} from '@/api/medical-insurance/si-yb-util'
 import XcTable from '@/components/xiao-chan/xc-table/XcTable.vue'
 
 let nowDay = new Date()
@@ -107,10 +107,15 @@ const queryTerm = reactive({
     type: "1",
 });
 
-const dept = ref([])
-const doctor = ref([])
-const regLevel = ref([])
+const dept = ref('')
+const doctor = ref('')
+const regLevel = ref('')
+const deptOptions = ref([])
+const doctorOptions = ref([])
 const regLevelOptions = ref([])
+const loadingDept = ref(false)
+const loadingDoctor = ref(false)
+const loadingRegLevel = ref(false)
 
 onMounted(() => {
     queryTerm.startTime = start + ' 00:00:00';
@@ -130,84 +135,51 @@ onMounted(() => {
     })
 });
 
-const deptOptions = ref([])
-const doctorOptions = ref([])
-const loadingDept = ref(false)
-const loadingDoctor = ref(false)
-const loadingRegLevel = ref(false)
 const selectDeptMultiple = (ks) => {
-    if (ks) {
-        loadingDept.value = true
-        const param = {
-            str: ks,
-        }
-        selectAllSmallDept(param).then((res) => {
-            deptOptions.value = res
-        })
-
-        if (deptOptions.value) {
-            setTimeout(() => {
-                loadingDept.value = false
-                dept.value = deptOptions.value.filter((item) => {
-                    return item.label.toLowerCase().includes(ks.toLowerCase())
-                })
-            }, 1000)
-        } else {
-            deptOptions.value = []
-        }
-    } else {
-        deptOptions.value = []
+  if (ks) {
+    loadingDept.value = true
+    const param = {
+      str: ks,
     }
+    selectAllSmallDept(param).then((res) => {
+      loadingDept.value = false
+      deptOptions.value = res
+    })
+  } else {
+    deptOptions.value = []
+  }
 }
 
 const selectDoctorMultiple = (ys) => {
-    if (ys) {
-        loadingDoctor.value = true
-        let d = dept.value
-        const paramF = {
-            str: ys,
-            dept: d,
-        }
-        selectAllDoctor(paramF).then((res) => {
-            doctorOptions.value = res
-        })
-        if (doctorOptions.value) {
-            setTimeout(() => {
-                loadingDoctor.value = false
-                doctor.value = doctorOptions.value.filter((item) => {
-                    return item.label.toLowerCase().includes(ys.toLowerCase())
-                })
-            }, 1000)
-        } else {
-            doctorOptions.value = []
-        }
-    } else {
-        doctorOptions.value = []
+  if (ys) {
+    loadingDoctor.value = true
+    let d = dept.value
+    const paramF = {
+      str: ys,
+      dept: d,
     }
+    selectAllDoctor(paramF).then((res) => {
+      loadingDoctor.value = false
+      doctorOptions.value = res
+    })
+  } else {
+    doctorOptions.value = []
+  }
 }
 
 const selectRegLevel = (reg) => {
-    if (reg) {
-        loadingRegLevel.value = true
-        const paramF = {
-            str: reg,
-        }
-        selectAllRegLevel(paramF).then((res) => {
-            regLevelOptions.value = res
-        })
-        if (regLevelOptions.value) {
-            setTimeout(() => {
-                regLevel.value = regLevelOptions.value.filter((item) => {
-                    return item.label.toLowerCase().includes(reg.toLowerCase())
-                })
-            }, 500)
-            loadingRegLevel.value = false
-        } else {
-            regLevelOptions.value = []
-        }
-    } else {
-        regLevelOptions.value = []
+  if (reg) {
+    loadingRegLevel.value = true
+    const paramF = {
+        str: reg,
     }
+    selectAllRegLevel(paramF).then((res) => {
+      loadingRegLevel.value = false
+      regLevelOptions.value = res
+    })
+  } else {
+    regLevelOptions.value = []
+  }
 }
 
 const returnData = ref({
@@ -232,9 +204,21 @@ const query = async () => {
             showClose: true,
         });
     }
-    queryTerm.dept = dept.value;
-    queryTerm.doctor = doctor.value;
-    queryTerm.regLevel = regLevel.value;
+    if(dept.value){
+      queryTerm.dept = dept.value;
+    } else {
+      queryTerm.dept = ''
+    }
+    if(doctor.value){
+      queryTerm.doctor = doctor.value;
+    } else {
+      queryTerm.doctor = ''
+    }
+    if(regLevel.value){
+      queryTerm.regLevel = regLevel.value;
+    } else {
+      queryTerm.regLevel = ''
+    }
     await selectReportPortalMenu(queryTerm)
         .then((res) => {
             let id
@@ -271,9 +255,21 @@ const exportData = () => {
             showClose: true,
         })
     }
-    queryTerm.dept = dept.value;
-    queryTerm.doctor = doctor.value;
-    queryTerm.regLevel = regLevel.value;
+    if(dept.value){
+      queryTerm.dept = dept.value;
+    } else {
+      queryTerm.dept = ''
+    }
+    if(doctor.value){
+      queryTerm.doctor = doctor.value;
+    } else {
+      queryTerm.doctor = ''
+    }
+    if(regLevel.value){
+      queryTerm.regLevel = regLevel.value;
+    } else {
+      queryTerm.regLevel = ''
+    }
     // 导出excel表格标题
     queryTerm.exportName = '接诊统计';
     exportReportPortalData(queryTerm)

src/views/reports/InfectiousDisease.vue

@@ -44,7 +44,7 @@
   </div>
 
 </template>
-<script setup name="OutHospUnsettl">
+<script setup name="InfectiousDisease">
 import {reactive, ref} from 'vue'
 import {shortcuts, clockinShortcuts} from '@/data/shortcuts'
 import {formatDate, getDateRangeFormatDate} from '@/utils/date'
@@ -137,9 +137,13 @@ const query = async () => {
   }
   if(dept.value){
     queryTerm.dept = dept.value;
+  } else {
+    queryTerm.dept = ''
   }
   if(doctor.value){
     queryTerm.doctor = doctor.value;
+  } else {
+    queryTerm.doctor = ''
   }
   queryTerm.zyh = admNo.value
   await selectReportPortalMenu(queryTerm)

src/views/yp-codg/YpCodgUpload.vue

@@ -4,12 +4,21 @@
       <el-input
         v-model.trim="keyCode"
         class="w-50 m-2"
-        style="width: 270px"
+        style="width: 220px"
         placeholder="请输入批次号或者门诊号"
         clearable
       >
         <template #prepend>单号</template>
       </el-input>
+      <el-input
+          v-model.trim="setlId"
+          class="w-50 m-2"
+          style="width: 200px; margin-left: 3px"
+          placeholder="请输入结算ID"
+          clearable
+      >
+        <template #prepend>结算ID</template>
+      </el-input>
       <el-date-picker
         v-model="dateRange"
         type="daterange"
@@ -18,7 +27,7 @@
         :clearable="false"
         end-placeholder="结束日期"
         :shortcuts="shortcuts"
-        style="width: 300px; margin-left: 3px"
+        style="width: 270px; margin-left: 3px"
       ></el-date-picker>
       <el-select
         v-model="opFlag"
@@ -287,6 +296,9 @@
                     <span v-else-if="scope.row.uploadFlag === '0'"
                       >上传失败</span
                     >
+                    <span v-else-if="scope.row.uploadFlag === '-2'"
+                      >已删除</span
+                    >
                     <span v-else>{{ scope.row.uploadFlag }}</span>
                   </template>
                 </el-table-column>
@@ -1182,6 +1194,7 @@ const queryData = ref({
   endTime: "",
   docuNo: "",
   patNo: "",
+  setlId: "",
   chargeCode: "",
   invChgType: "",
   groupNo: "",
@@ -1276,6 +1289,7 @@ const handleSelinfoSelectionChangeCx = data => {
 };
 
 const keyCode = ref("");
+const setlId = ref('')
 const ztFlag = ref("3");
 const retFlag = ref("");
 const opFlag = ref("108");
@@ -1426,6 +1440,7 @@ const queryCodgSelinfoUpload = () => {
   }
   queryData.value.patNo = keyCode.value;
   queryData.value.groupNo = uploadGroupNoYf.value;
+  queryData.value.setlId = setlId.value;
   queryData.value.type = ztFlag.value;
   queryData.value.uploadFlag = retFlag.value;
   selectYpSelinfoDetail(queryData.value)
@@ -1486,6 +1501,7 @@ const queryCodgSelinfoUploadResult = () => {
   }
   queryData.value.patNo = keyCode.value;
   queryData.value.groupNo = uploadGroupNoYf.value;
+  queryData.value.setlId = setlId.value;
   queryData.value.type = ztFlag.value;
   queryData.value.uploadFlag = retFlag.value;
   selectYpSelinfoResult(queryData.value)