+
+ 报告医师：{{ infoParams.diagDoctor }}
+
报告日期：{{ formatDate(infoParams.diagDate as unknown as Date, 'YYYY-MM-DD') }}
- 审核医师：{{ infoParams.reviewDoctor }}
-
+ 审核医师：{{ infoParams.reviewDoctor }}
+
审核日期：{{ formatDate(infoParams.reviewDate as unknown as Date, 'YYYY-MM-DD') }}
-
@@ -203,7 +203,7 @@ onMounted(async () => {
.ultrasound-findings p,
.ultrasound-recommendation p {
- font-size: 16px;
+ font-size: 22px;
margin: 5px 2px 5px 30px;
}
@@ -217,4 +217,12 @@ onMounted(async () => {
justify-content: space-around;
margin: 10px 0;
}
+/* 使用更具体的选择器并添加 !important 来确保样式优先级 */
+.doctor-info-row {
+ font-size: 19px !important;
+}
+
+.doctor-info {
+ font-size: 19px !important;
+}
diff --git a/src/views/dicomForm/dicomViewForm.vue b/src/views/dicomForm/dicomViewForm.vue
index 5e2068b4..422be271 100644
--- a/src/views/dicomForm/dicomViewForm.vue
+++ b/src/views/dicomForm/dicomViewForm.vue
@@ -480,27 +480,27 @@ const exportPdfCTToBase64 = async () => {
calculateAge(applyFormVO.value.birthday) //刷新年龄
let orgInfoTemp = await ReportPrintStatisticsApi.getOrg(infoParams.value.orgId.trim())
- await PatientexamlistApi.generatePdf_ct({
- model: '0',
- folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString(),
- id: ID.toString(),
- regid: infoParams.value.regId,
- examid: infoParams.value.examId,
- name: infoParams.value.pname,
- gender: infoParams.value.gender,
- age: age.value + '岁',
- deviceName: infoParams.value.deviceName,
- Department: infoParams.value.billDoctorDepartment,
- examItemName: infoParams.value.examItemName,
- examDescription: infoParams.value.examDescription,
- diagResults: infoParams.value.diagResults,
- hsname: orgInfoTemp.orgName,
- diagDoctor: infoParams.value.diagDoctor,
- diagDate: infoParams.value.diagDate,
- reviewDoctor: infoParams.value.reviewDoctor,
- reviewDate: infoParams.value.reviewDate
- })
- if (false) {
+ // await PatientexamlistApi.generatePdf_ct({
+ // model: '0',
+ // folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString(),
+ // id: ID.toString(),
+ // regid: infoParams.value.regId,
+ // examid: infoParams.value.examId,
+ // name: infoParams.value.pname,
+ // gender: infoParams.value.gender,
+ // age: age.value + '岁',
+ // deviceName: infoParams.value.deviceName,
+ // Department: infoParams.value.billDoctorDepartment,
+ // examItemName: infoParams.value.examItemName,
+ // examDescription: infoParams.value.examDescription,
+ // diagResults: infoParams.value.diagResults,
+ // hsname: orgInfoTemp.orgName,
+ // diagDoctor: infoParams.value.diagDoctor,
+ // diagDate: infoParams.value.diagDate,
+ // reviewDoctor: infoParams.value.reviewDoctor,
+ // reviewDate: infoParams.value.reviewDate
+ // })
+
showPdfContent.value = true
nextTick(() => {
setTimeout(async () => {
@@ -518,7 +518,7 @@ const exportPdfCTToBase64 = async () => {
}
}, 1000)
})
- }
+
}
const infoParams = ref({
diff --git a/src/views/system/doctor/Form.vue b/src/views/system/doctor/Form.vue
index 9c8bd2a0..f485f90e 100644
--- a/src/views/system/doctor/Form.vue
+++ b/src/views/system/doctor/Form.vue
@@ -137,7 +137,7 @@ const formRules = reactive({
// { pattern: /^[0-9]*$/, message: '只能输入纯数字', trigger: 'blur' }
],
orgId: [{ required: true, message: '请输入机构编号', trigger: 'blur' }],
- doctorLevel: [{ required: true, message: '请输入医生级别', trigger: 'blur' }],
+ // doctorLevel: [{ required: true, message: '请输入医生级别', trigger: 'blur' }],
departmentName: [{ required: true, message: '请选择所属科室', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
diff --git a/src/views/ultrasoniccom/ultrasonicForm.vue b/src/views/ultrasoniccom/ultrasonicForm.vue
index 4d418005..2a6985db 100644
--- a/src/views/ultrasoniccom/ultrasonicForm.vue
+++ b/src/views/ultrasoniccom/ultrasonicForm.vue
@@ -284,14 +284,37 @@
-
+
+
+
+
-
+ placeholder="请选择审核医生"
+ clearable
+ :disabled="applyFormVO.reportstatus === '已审核'"
+ >
+
+
@@ -523,6 +546,7 @@ import { ReportPrintStatisticsApi } from '@/api/applyregistration/reportPrintSta
import { formatDate } from '@/utils/formatTime'
import PdfContent from '@/views/applyregistration/reportPrintStatistics/ReportInfoUS.vue' // 引入你的PDF内容组件
import * as ConfigApi from '@/api/infra/config' //李晓东
+import { Api, VO } from '@/api/system/doctor'
/** 超声组件 */
defineOptions({ name: 'Ultrasonic' })
@@ -541,7 +565,7 @@ const examinedisabled = ref(false) //审核按钮是否可见
const isImageLoaded = ref(false) //是否展示图片清除按钮
const isImageLoaded2 = ref(false) //是否展示图片清除按钮
const isImageLoaded3 = ref(false) //是否展示图片清除按钮
-
+const doctorList = ref([]) //医生列表
// 中间的选择图加载和失败事件
const handleLoad = (id: string) => {
if (applyFormVO.value.reportstatus && applyFormVO.value.reportstatus == '已审核') {
@@ -653,30 +677,30 @@ const exportPdfUSToBase64 = async () => {
image3 = window.location.origin + image3
}
}
- await PatientexamlistApi.generatePdf_us({
- model: '0',
- folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString(),
- id: ID.toString(),
- regid: infoParams.value.regId,
- examid: infoParams.value.examId,
- name: infoParams.value.pname,
- gender: infoParams.value.gender,
- age: age.value + '岁',
- deviceName: infoParams.value.deviceName,
- Department: infoParams.value.billDoctorDepartment,
- examItemName: infoParams.value.examItemName,
- examDescription: infoParams.value.examDescription,
- diagResults: infoParams.value.diagResults,
- hsname: orgInfoTemp.orgName,
- diagDoctor: infoParams.value.diagDoctor,
- diagDate: infoParams.value.diagDate,
- reviewDoctor: infoParams.value.reviewDoctor,
- reviewDate: infoParams.value.reviewDate,
- image1: image1,
- image2: image2,
- image3: image3
- })
- if (false) {
+ // await PatientexamlistApi.generatePdf_us({
+ // model: '0',
+ // folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString(),
+ // id: ID.toString(),
+ // regid: infoParams.value.regId,
+ // examid: infoParams.value.examId,
+ // name: infoParams.value.pname,
+ // gender: infoParams.value.gender,
+ // age: age.value + '岁',
+ // deviceName: infoParams.value.deviceName,
+ // Department: infoParams.value.billDoctorDepartment,
+ // examItemName: infoParams.value.examItemName,
+ // examDescription: infoParams.value.examDescription,
+ // diagResults: infoParams.value.diagResults,
+ // hsname: orgInfoTemp.orgName,
+ // diagDoctor: infoParams.value.diagDoctor,
+ // diagDate: infoParams.value.diagDate,
+ // reviewDoctor: infoParams.value.reviewDoctor,
+ // reviewDate: infoParams.value.reviewDate,
+ // image1: image1,
+ // image2: image2,
+ // image3: image3
+ // })
+
showPdfContent.value = true
nextTick(() => {
setTimeout(async () => {
@@ -694,7 +718,7 @@ const exportPdfUSToBase64 = async () => {
}
}, 1000)
})
- }
+
}
const infoParams = ref({
@@ -733,7 +757,10 @@ const save = async () => {
message.warning('请选择影像图')
return
}
-
+ if(applyFormVO.value.diagDoctor==null||applyFormVO.value.diagDoctor=='undefined' || applyFormVO.value.diagDoctor==''){
+ message.warning('请选择诊断医生')
+ return
+ }
// 二次确认
await message.delConfirm('是否进行保存', '确认')
let timesta = new Date()
@@ -745,8 +772,10 @@ const save = async () => {
examineFormVO.value.diagResults = zdjl.value
examineFormVO.value.notes = notes.value
examineFormVO.value.diagFlag = radio1.value
- examineFormVO.value.diagDoctor = Profilevo.value.doctorname
- examineFormVO.value.diagDoctorId = Profilevo.value.doctorID
+ let diagDoctor = applyFormVO.value.diagDoctor.split('|')[0]
+ let diagDoctorId = applyFormVO.value.diagDoctor.split('|')[1]
+ examineFormVO.value.diagDoctor = diagDoctor
+ examineFormVO.value.diagDoctorId = diagDoctorId
// examineFormVO.value.reviewDoctor = Profilevo.value.username
examineFormVO.value.reportstatus = '已分析'
// examineFormVO.value.diagDate=localDateTime
@@ -776,7 +805,14 @@ const save = async () => {
// 审核
const examine = async () => {
if (applyFormVO.value.reportstatus === '已分析') {
- const response = await PatientexamlistApi.examine(ID.toString())
+
+ if(applyFormVO.value.reviewDoctor==null||applyFormVO.value.reviewDoctor=='undefined' || applyFormVO.value.reviewDoctor==''){
+ message.warning('请选择审核医生')
+ return
+ }
+ let reviewDoctor = applyFormVO.value.reviewDoctor.split('|')[0]
+ let reviewDoctorId = applyFormVO.value.reviewDoctor.split('|')[1]
+ const response = await PatientexamlistApi.examine(ID.toString(),reviewDoctorId,reviewDoctor)
if (response) {
message.alertSuccess('审核成功')
//查询患者信息 根据ID
@@ -1142,11 +1178,19 @@ const open = async (id: number, orgid: string, regid: string) => {
//获取登录人信息
getlogininfo()
+ //获取医生列表
+ getdoctorlist(orgid)
if (savedisabled.value == false) getimages('')
} finally {
formLoading.value = false
}
}
+
+//获取医生列表
+const getdoctorlist = async (orgid:string) => {
+ const data = await Api.getAlllist(orgid)
+ doctorList.value = data
+}
// 打开视频
const videoformRef = ref()
const openvideo = () => {