diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index d7047970..a3c7198c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.enums.DelFlag; import com.core.common.exception.ServiceException; import com.core.common.utils.AssignSeqUtil; import com.core.common.utils.MessageUtils; @@ -17,6 +18,8 @@ import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.*; import com.openhis.document.domain.RequestForm; import com.openhis.document.service.IRequestFormService; +import com.openhis.lab.domain.Specimen; +import com.openhis.lab.service.ISpecimenService; import com.openhis.web.doctorstation.dto.ActivityChildrenJsonParams; import com.openhis.web.doctorstation.utils.AdviceUtils; import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService; @@ -67,6 +70,39 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer @Resource IActivityDefinitionService iActivityDefinitionService; + @Resource + ISpecimenService iSpecimenService; + + /** + * 校验当前用户是否有权操作该申请单（申请者本人或管理员） + */ + private R validateRequestFormPermission(RequestForm requestForm) { + if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) { + return null; + } + Long currentPractitionerId = SecurityUtils.getLoginUser().getPractitionerId(); + Long requesterId = requestForm.getRequesterId(); + if (currentPractitionerId == null || requesterId == null + || !currentPractitionerId.equals(requesterId)) { + return R.fail("无操作权限，仅申请开立者或管理员可操作"); + } + return null; + } + + /** + * 校验关联医嘱是否已采证（存在已采集/已接收标本则不可撤回） + */ + private boolean hasCollectedSpecimen(List serviceRequestIds) { + if (serviceRequestIds == null || serviceRequestIds.isEmpty()) { + return false; + } + long count = iSpecimenService.count( + new LambdaQueryWrapper() + .in(Specimen::getServiceId, serviceRequestIds) + .ge(Specimen::getCollectionStatusEnum, SpecCollectStatus.COLLECTED.getValue())); + return count > 0; + } + /** * 保存申请单 * @@ -528,12 +564,17 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer if (requestForm == null) { return R.fail("申请单不存在"); } + R permissionResult = validateRequestFormPermission(requestForm); + if (permissionResult != null) { + return permissionResult; + } String prescriptionNo = requestForm.getPrescriptionNo(); // 查询该申请单下所有 ServiceRequest（含子项） List serviceRequests = iServiceRequestService.list( new LambdaQueryWrapper() - .eq(ServiceRequest::getPrescriptionNo, prescriptionNo)); + .eq(ServiceRequest::getPrescriptionNo, prescriptionNo) + .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode())); if (serviceRequests == null || serviceRequests.isEmpty()) { return R.fail("未找到关联的诊疗医嘱"); } @@ -563,7 +604,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer // 4. 删除申请单 iRequestFormService.removeById(requestFormId); - log.info("检查申请单删除成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo); + log.info("检验申请单删除成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo); return R.ok("删除成功"); } @@ -576,32 +617,43 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer if (requestForm == null) { return R.fail("申请单不存在"); } + R permissionResult = validateRequestFormPermission(requestForm); + if (permissionResult != null) { + return permissionResult; + } String prescriptionNo = requestForm.getPrescriptionNo(); // 查询该申请单下所有 ServiceRequest List serviceRequests = iServiceRequestService.list( new LambdaQueryWrapper() - .eq(ServiceRequest::getPrescriptionNo, prescriptionNo)); + .eq(ServiceRequest::getPrescriptionNo, prescriptionNo) + .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode())); if (serviceRequests == null || serviceRequests.isEmpty()) { return R.fail("未找到关联的诊疗医嘱"); } + List serviceRequestIds = serviceRequests.stream() + .map(ServiceRequest::getId).collect(Collectors.toList()); + + // 校验：标本已采集则不可撤回 + if (hasCollectedSpecimen(serviceRequestIds)) { + return R.fail("标本已采集，无法撤回"); + } + // 校验：只有已签发(status=2)的申请单可撤回 boolean allActive = serviceRequests.stream() .allMatch(sr -> RequestStatus.ACTIVE.getValue().equals(sr.getStatusEnum())); if (!allActive) { - return R.fail("只有已签发状态的申请单可撤回"); + return R.fail("只有已签发且未采证的申请单可撤回"); } - // 将所有 ServiceRequest 状态改回待签发(DRAFT=0) - List serviceRequestIds = serviceRequests.stream() - .map(ServiceRequest::getId).collect(Collectors.toList()); + // 将所有 ServiceRequest 状态改回待签发，与申请单展示状态同步 iServiceRequestService.update( new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue()), new LambdaUpdateWrapper() .in(ServiceRequest::getId, serviceRequestIds)); - log.info("检查申请单撤回成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo); + log.info("检验申请单撤回成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo); return R.ok("撤回成功"); } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index 782d38c4..69983e4e 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -35,21 +35,27 @@ WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0' AND ws.status_enum = 8 ) THEN 6 + WHEN EXISTS ( + SELECT 1 FROM wor_service_request ws + WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0' + AND ws.status_enum = 5 + ) THEN 7 WHEN EXISTS ( SELECT 1 FROM wor_service_request ws WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0' AND ws.status_enum = 3 ) THEN 5 + WHEN EXISTS ( + SELECT 1 FROM wor_service_request ws + INNER JOIN lab_specimen ls ON ls.service_id = ws.id + WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0' + AND ls.collection_status_enum >= 1 + ) THEN 4 WHEN EXISTS ( SELECT 1 FROM wor_service_request ws WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0' AND ws.status_enum = 2 ) THEN 1 - WHEN EXISTS ( - SELECT 1 FROM wor_service_request ws - WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0' - AND ws.status_enum = 5 - ) THEN 7 ELSE 0 END AS computed_status FROM doc_request_form AS drf diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue index 33fdbe8a..093f3beb 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue @@ -749,22 +749,26 @@ function handleInfectiousDiseaseReport() { '手足口病': '0311', }; - // 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断 - const allSelectedDiseases = form.value.diagnosisList - .filter(d => d.name && d.hasInfectiousReport !== 1) - .map(d => diseaseNameToCode[d.name] || null) - .filter(code => code); + // 获取所有命中传染病映射的诊断，但跳过已有已提交报卡的诊断 + const infectiousDiagnoses = form.value.diagnosisList + .map(d => ({ + diagnosis: d, + diseaseCode: d.name && d.hasInfectiousReport !== 1 ? diseaseNameToCode[d.name] : null + })) + .filter(item => item.diseaseCode); + + const allSelectedDiseases = infectiousDiagnoses.map(item => item.diseaseCode); if (allSelectedDiseases.length === 0) { return; } - // 优先使用主诊断（同样跳过已有报卡的） - const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1); - const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0]; + // 优先使用命中传染病映射的主诊断，否则使用第一条命中的传染病诊断 + const mainInfectiousDiagnosis = infectiousDiagnoses.find(item => item.diagnosis.maindiseFlag === 1)?.diagnosis; + const firstInfectiousDiagnosis = infectiousDiagnoses[0].diagnosis; const diagnosisToShow = { - ...(mainDiagnosis || firstDiagnosis), + ...(mainInfectiousDiagnosis || firstInfectiousDiagnosis), selectedDiseases: allSelectedDiseases }; diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue index 837f2eb1..6d41fdb9 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue @@ -1442,7 +1442,7 @@ async function buildSubmitData() { const submitData = { cardNo: formData.cardNo, visitId: props.patientInfo?.encounterId || formData.encounterId || null, - diagId: formData.diagnosisId ? Number(formData.diagnosisId) : null, + diagId: formData.diagnosisId || null, patId: formData.patientId || null, idType: 1, // 默认身份证 idNo: formData.idNo, diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue index 7e6f764b..338cb423 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue @@ -115,20 +115,20 @@ - +