From b6c14a3f42f4f300e4d8b1274e6a3e5de94711b6 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Wed, 12 Mar 2025 13:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=99-=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoctorStationDiagnosisAppServiceImpl.java | 22 ++++++- .../DoctorStationDiagnosisController.java | 1 - .../DoctorStationDiagnosisAppMapper.java | 32 ++++++++++ .../DoctorStationDiagnosisAppMapper.xml | 58 +++++++++++++++++++ 4 files changed, 109 insertions(+), 4 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java index 8431a795..87e162aa 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java @@ -15,6 +15,7 @@ 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.utils.MessageUtils; +import com.core.common.utils.SecurityUtils; import com.openhis.administration.domain.EncounterDiagnosis; import com.openhis.administration.service.IEncounterDiagnosisService; import com.openhis.clinical.domain.Condition; @@ -219,14 +220,29 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn doctorStationDiagnosisAppMapper.getPatientHistoryList(PublicationStatus.ACTIVE.getValue(), patientId); this.handleConditionDefinitionMetadata(patientHistoryList); conditionDefinitionBusinessClass.setPatientHistoryList(patientHistoryList); - // - + // 医生常用诊断 + Long userId = SecurityUtils.getLoginUser().getUserId(); // 当前登录账号ID + List doctorCommonUseList = + doctorStationDiagnosisAppMapper.getDoctorCommonUseList(PublicationStatus.ACTIVE.getValue(), userId); + this.handleConditionDefinitionMetadata(doctorCommonUseList); + conditionDefinitionBusinessClass.setDoctorCommonUseList(doctorCommonUseList); + // 用户个人诊断 + List userPersonalList = doctorStationDiagnosisAppMapper + .getUserPersonalList(PublicationStatus.ACTIVE.getValue(), BindingType.PERSONAL.getValue(), userId); + this.handleConditionDefinitionMetadata(userPersonalList); + conditionDefinitionBusinessClass.setUserPersonalList(userPersonalList); + // 科室诊断 + // TODO: currentUserOrganizationId(当前登录账号所属的科室ID) 待补充 + List organizationList = doctorStationDiagnosisAppMapper + .getOrganizationList(PublicationStatus.ACTIVE.getValue(), BindingType.DEFINITION.getValue(), null); + this.handleConditionDefinitionMetadata(organizationList); + conditionDefinitionBusinessClass.setOrganizationList(organizationList); return R.ok(conditionDefinitionBusinessClass); } /** * 处理诊断定义元数据 - * + * * @param conditionDefinitionMetadataList 诊断定义元数据集合 */ private void handleConditionDefinitionMetadata(List conditionDefinitionMetadataList) { diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java index e0607259..51f935d6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationDiagnosisController.java @@ -54,7 +54,6 @@ public class DoctorStationDiagnosisController { status.getInfo())) .collect(Collectors.toList()); diagnosisBelongBindingInitDto.setVerificationStatusOptions(verificationStatusOptions); - return R.ok(diagnosisBelongBindingInitDto); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java index b19c6d45..5a958e1c 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationDiagnosisAppMapper.java @@ -41,4 +41,36 @@ public interface DoctorStationDiagnosisAppMapper { List getPatientHistoryList(@Param("statusEnum") Integer statusEnum, @Param("patientId") Long patientId); + /** + * 查询医生常用诊断 + * + * @param statusEnum 状态 + * @param userId 当前登录账号id + * @return 医生常用诊断 + */ + List getDoctorCommonUseList(@Param("statusEnum") Integer statusEnum, + @Param("userId") Long userId); + + /** + * 查询用户个人诊断 + * + * @param statusEnum 状态 + * @param bindingEnum 绑定类型 + * @param userId 当前登录账号id + * @return 用户个人诊断 + */ + List getUserPersonalList(@Param("statusEnum") Integer statusEnum, + @Param("bindingEnum") Integer bindingEnum, @Param("userId") Long userId); + + /** + * 查询科室诊断 + * + * @param statusEnum 状态 + * @param bindingEnum 绑定类型 + * @param currentUserOrganizationId 当前登录账号所属的科室ID + * @return 科室诊断 + */ + List getOrganizationList(@Param("statusEnum") Integer statusEnum, + @Param("bindingEnum") Integer bindingEnum, @Param("currentUserOrganizationId") Long currentUserOrganizationId); + } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml index 2f5037e3..568adb51 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml @@ -58,4 +58,62 @@ ) + + + + + + \ No newline at end of file