diff --git a/src/assets/config/apiConfig.ts b/src/assets/config/apiConfig.ts
index b963a44..6482e3d 100644
--- a/src/assets/config/apiConfig.ts
+++ b/src/assets/config/apiConfig.ts
@@ -1,42 +1,47 @@
-export enum apiConfig{
+export enum apiConfig {
/**
* 用户操作
*/
- "ManagerUserLogin"="manager/user/login",//登录
- "signIn"="sign/in",//签到
- "signOut"="sign/out",//签退
- "managerUserVerify"="manager/user/verify",//获取用户信息
+ "ManagerUserLogin" = "manager/user/login",//登录
+ "signIn" = "sign/in",//签到
+ "signOut" = "sign/out",//签退
+ "managerUserVerify" = "manager/user/verify",//获取用户信息
/**
* 挂号操作
*/
- "registrationList"="registration/list",//挂号列表
+ "RegistrationList" = "registration/list",//挂号列表
+ "RegistrationAdd" = "registration/add",//添加挂号
+ "RegistrationEdit" = "registration/edit",//修改挂号
+
/**
* 接诊操作
*/
- "RegistrationDetail" ="medical/record/getDetailByRegisId",//详情
- "RegistrationList" ="registration/getListByType",//患者列表
- "RegistrationChangeStatus"="registration/changeStatus",
-
+ "RegistrationChangeStatus" = "registration/changeStatus",//挂号状态
+ "MedicalDetailByRegisId" = "medical/record/getDetailByRegisId",//患者详情
+ "RegistrationListByType" = "registration/getListByType",//患者列表
+ "StatisticsGetTipCount" = "statistics/getTipCount",//患者状态数量
+ "MedicalRecordSave" = "medical/record/save",//保存接诊信息
+ "SocialDiagnoseSearch" = "social/diagnose/search",//接诊详情
/**
* 科室成员信息
*/
- "OrganizationMemberSave"="organization/member/save",//添加 编辑成员信息
- "OrganizationMemberSearch"="organization/member/search",//搜索成员
- "OrganizationSectionAllList"="organization/section/allList",//获取所有科室列表
- "OrganizationSectionListByMemberId"="organization/section/listByMemberId",//获取当前成员所属科室列表
- "OrganizationMemberListBySectionId"="organization/member/listBySectionId",//获取当前科室的所有医生列表
+ "OrganizationMemberSave" = "organization/member/save",//添加 编辑成员信息
+ "OrganizationMemberSearch" = "organization/member/search",//搜索成员
+ "OrganizationSectionAllList" = "organization/section/allList",//获取所有科室列表
+ "OrganizationSectionListByMemberId" = "organization/section/listByMemberId",//获取当前成员所属科室列表
+ "OrganizationMemberListBySectionId" = "organization/member/listBySectionId",//获取当前科室的所有医生列表
/**
* 商品
*/
- "GoodsDisableSale"="goods/goods/disableSale",
- "GoodsEnableSale"="goods/goods/enableSale",
-
+ "GoodsDisableSale" = "goods/goods/disableSale",
+ "GoodsEnableSale" = "goods/goods/enableSale",
+
/**
* 收费接口
*/
- "ChargeListChargeLog"="charge/listChargeLog",//查询收费记录
- "RecordGetChargeQueue"="medical/record/getChargeQueue"//查询收费记录
+ "ChargeListChargeLog" = "charge/listChargeLog",//查询收费记录
+ "RecordGetChargeQueue" = "medical/record/getChargeQueue"//查询收费记录
}
diff --git a/src/components/outpatient/Case.vue b/src/components/outpatient/Case.vue
index 6d5f54a..71f9402 100644
--- a/src/components/outpatient/Case.vue
+++ b/src/components/outpatient/Case.vue
@@ -40,7 +40,7 @@
-
+
@@ -75,7 +75,8 @@ import {
import Panel from "@/components/common/Panel.vue";
import PopoverInput from "@/components/PopoverInput.vue";
import DiagnosisSearchInput from "@/components/outpatient/DiagnosisSearchInput.vue";
-import PhysiqueExamInuput from "@/components/outpatient/PhysiqueExamInuput.vue";
+import PhysiqueExamInput from "@/components/outpatient/PhysiqueExamInput.vue";
+import {apiConfig} from "@/assets/config/apiConfig.ts";
const props = defineProps({
disabled: {
@@ -94,7 +95,7 @@ interface ShowConfig {
prop: string;
}
-const diagnosisSearchApi = "social/diagnose/search"
+const diagnosisSearchApi = apiConfig.SocialDiagnoseSearch
const diagnosisShowConfig: ShowConfig[] = [
{
label: "诊断名称",
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 57b5247..8692d26 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -35,7 +35,7 @@
alt="头像"/>
-
+
{{ item.name }}
@@ -144,7 +144,7 @@ const init = async () => {
clickLi(null)
loading.value = true
try {
- let data: any = await post(apiConfig.RegistrationList, {
+ let data: any = await post(apiConfig.RegistrationListByType, {
query: {
status: curStatus.value,
beginTime: selectedDate.value,
@@ -168,7 +168,7 @@ const init = async () => {
initStatusList()
}
const initStatusList = () => {
- post('statistics/getTipCount', {
+ post(apiConfig.StatisticsGetTipCount, {
beginTime: selectedDate.value,
endTime: getEndOfDay(new Date(selectedDate.value))
}).then((res: any) => {
@@ -192,12 +192,12 @@ const clickLi = (item: any, showBox: any = true) => {
return
}
if (action == "confirm") {
- post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => {
+ post(apiConfig.RegistrationChangeStatus, {id: item.id, status: 2}).then((res: any) => {
curStatus.value = 2
curItem.value = res
initStatusList()
emit('clickItem', curItem.value)
- selectedDate.value=getCurrentDate()
+ selectedDate.value = getCurrentDate()
})
}
},
@@ -405,7 +405,8 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
right: 0;
top: 50px;
}
-.yuYueIcon{
+
+.yuYueIcon {
width: 13px;
height: 13px;
position: absolute;
diff --git a/src/components/outpatient/PhysiqueExamInuput.vue b/src/components/outpatient/PhysiqueExamInput.vue
similarity index 100%
rename from src/components/outpatient/PhysiqueExamInuput.vue
rename to src/components/outpatient/PhysiqueExamInput.vue
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index fad493a..70fc1c7 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -309,7 +309,7 @@ const save = () => {
}
if (edit_data.value.id) {
- post('registration/edit', {
+ post(apiConfig.RegistrationEdit, {
data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo,
mdtrtCertType: socialCard.value?.mdtrtCertType
}).then(() => {
@@ -317,7 +317,7 @@ const save = () => {
close()
})
} else {
- post('registration/add', {
+ post(apiConfig.RegistrationAdd, {
data: data,
mdtrtCertNo: socialCard.value?.mdtrtCertNo,
mdtrtCertType: socialCard.value?.mdtrtCertType
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index f89057f..ab6fadb 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -40,10 +40,10 @@
import MedicalQueue from "@/components/outpatient/MedicalQueue.vue";
import MedicalHistory from "@/components/outpatient/MedicalHistory.vue";
import Case from "@/components/outpatient/Case.vue";
-import {ref, watch, nextTick, onMounted} from "vue";
+import {ref, watch, nextTick} from "vue";
import Settlement from "@/components/outpatient/Settlement.vue";
import {post} from "@/utils/request.ts";
-import {type Action, ElMessage, ElMessageBox} from "element-plus";
+import {ElMessage} from "element-plus";
import {apiConfig} from "@/assets/config/apiConfig.ts";
import PatientCard from "@/components/charge/PatientCard.vue";
import ServiceDetail from "@/components/common/service/ServiceDetail.vue";
@@ -52,8 +52,6 @@ import GoodsDetail from "@/components/common/goods/GoodsDetail.vue";
const curRegister = ref()
const registerId = ref()
const patientId = ref()
-const itemDetail = ref([])
-const goodsList = ref([])
const formData = ref({
diagType: 0,
itemDetail: [],
@@ -102,7 +100,7 @@ const save = () => {
if (!formData.value.diagnosisDetail || JSON.parse(formData.value.diagnosisDetail).length == 0) {
ElMessage.error("请填写诊断信息")
} else {
- post('medical/record/save', {data: data}).then((res: any) => {
+ post(apiConfig.MedicalRecordSave, {data: data}).then((res: any) => {
ElMessage.success("接诊完毕,请到收费页面收费")
debugger
medicalQueueRef.value?.changeCurItemOrStatus(res, 3);
@@ -110,7 +108,6 @@ const save = () => {
})
}
}
-const totalAmount = ref(0)
const medicalHistoryRef = ref()
const patientCardRef = ref()
const patientRegistration = ref({})// 当前挂号信息
@@ -127,7 +124,7 @@ const clickItem = (item: any) => {
initFormData()
}
if (item.status == 3) {
- post(apiConfig.RegistrationDetail, {
+ post(apiConfig.MedicalDetailByRegisId, {
regisId: item.id
}).then((res: any) => {
formData.value = res.diagnosisMedicalRecord
@@ -142,9 +139,7 @@ const clickItem = (item: any) => {
})
}
-
nextTick(() => {
-
medicalHistoryRef.value?.init(patientId.value);
patientCardRef.value?.init(curRegister.value?.id)
})
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index 87583e5..6aca97c 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -91,8 +91,6 @@