From beb052adbb4d86b73bd6312d37a67e11738d9e6f Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Tue, 11 Mar 2025 10:53:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4-=E8=AF=8A=E6=96=AD=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IDoctorStationDiagnosisAppService.java | 20 ++++++++ .../DoctorStationDiagnosisAppServiceImpl.java | 47 +++++++++++++++++++ .../DoctorStationDiagnosisController.java | 29 ++++++++++++ .../dto/DiagnosisBelongBindingDto.java | 11 +++++ .../DoctorStationDiagnosisAppMapper.java | 20 ++++++++ .../DoctorStationDiagnosisAppMapper.xml | 32 +++++++++++++ .../DiagnosisBelongBindingServiceImpl.java | 1 - 7 files changed, 159 insertions(+), 1 deletion(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java index 7d244a1e..ff1163c2 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationDiagnosisAppService.java @@ -24,4 +24,24 @@ public interface IDoctorStationDiagnosisAppService { */ R updateDiagnosisBelongBinding(DiagnosisBelongBindingDto diagnosisBelongBindingDto); + /** + * 查询诊断归属绑定列表 + * + * @param diagnosisBelongBindingDto 查询条件dto + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页 + * @param pageSize 每页多少条 + * @return 诊断归属绑定列表 + */ + R getDiagnosisBelongBindingPage(DiagnosisBelongBindingDto diagnosisBelongBindingDto, String searchKey, + Integer pageNo, Integer pageSize); + + /** + * 删除诊断归属绑定 + * + * @param id ID + * @return 结果 + */ + R delDiagnosisBelongBinding(Long id); + } 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 694b12e7..fa598ac5 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 @@ -1,16 +1,25 @@ package com.openhis.web.doctorstation.appservice.impl; +import java.util.Arrays; +import java.util.HashSet; + import javax.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.openhis.clinical.domain.DiagnosisBelongBinding; import com.openhis.clinical.service.IDiagnosisBelongBindingService; import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.BindingType; +import com.openhis.common.utils.EnumUtils; +import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.doctorstation.appservice.IDoctorStationDiagnosisAppService; import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto; import com.openhis.web.doctorstation.mapper.DoctorStationDiagnosisAppMapper; @@ -72,4 +81,42 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断归属绑定关系"})); } + /** + * 查询诊断归属绑定列表 + * + * @param diagnosisBelongBindingDto 查询条件dto + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页 + * @param pageSize 每页多少条 + * @return 诊断归属绑定列表 + */ + @Override + public R getDiagnosisBelongBindingPage(DiagnosisBelongBindingDto diagnosisBelongBindingDto, String searchKey, + Integer pageNo, Integer pageSize) { + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper( + diagnosisBelongBindingDto, searchKey, new HashSet<>(Arrays.asList("definition_name", "object_name")), null); + IPage diagnosisBelongBindingPage = + doctorStationDiagnosisAppMapper.getDiagnosisBelongBindingPage(new Page<>(pageNo, pageSize), + BindingType.PERSONAL.getValue(), BindingType.DEFINITION.getValue(), queryWrapper); + diagnosisBelongBindingPage.getRecords().forEach(e -> { + // 诊断绑定类型 + e.setBindingEnum_enumText(EnumUtils.getInfoByValue(BindingType.class, e.getBindingEnum())); + }); + return R.ok(diagnosisBelongBindingPage); + } + + /** + * 删除诊断归属绑定 + * + * @param id ID + * @return 结果 + */ + @Override + public R delDiagnosisBelongBinding(Long id) { + boolean res = iDiagnosisBelongBindingService.removeById(id); + return res ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"诊断归属绑定"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null)); + } + } 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 5c39c36e..ff42f1a0 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 @@ -71,4 +71,33 @@ public class DoctorStationDiagnosisController { return iDoctorStationDiagnosisAppService.updateDiagnosisBelongBinding(diagnosisBelongBindingDto); } + /** + * 查询诊断归属绑定列表 + * + * @param diagnosisBelongBindingDto 查询条件dto + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页 + * @param pageSize 每页多少条 + * @return 诊断归属绑定列表 + */ + @GetMapping(value = "/diagnosis-belong-binding-page") + public R getDiagnosisBelongBindingPage(DiagnosisBelongBindingDto diagnosisBelongBindingDto, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { + return iDoctorStationDiagnosisAppService.getDiagnosisBelongBindingPage(diagnosisBelongBindingDto, searchKey, + pageNo, pageSize); + } + + /** + * 删除诊断归属绑定 + * + * @param id ID + * @return 结果 + */ + @DeleteMapping("/diagnosis-belong-binding") + public R delDiagnosisBelongBinding(@RequestParam Long id) { + return iDoctorStationDiagnosisAppService.delDiagnosisBelongBinding(id); + } + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java index 6ed59ac4..714f1feb 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisBelongBindingDto.java @@ -24,11 +24,22 @@ public class DiagnosisBelongBindingDto { @JsonSerialize(using = ToStringSerializer.class) private Long objectId; + /** + * 对象名称 + */ + private String objectName; + /** 诊断定义ID */ @JsonSerialize(using = ToStringSerializer.class) private Long definitionId; + /** + * 诊断(病种)名称 + */ + private String definitionName; + /** 绑定类型 */ private Integer bindingEnum; + private String bindingEnum_enumText; } 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 04794d3d..aab9a673 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 @@ -1,11 +1,31 @@ package com.openhis.web.doctorstation.mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.doctorstation.dto.DiagnosisBelongBindingDto; + /** * 医生站-诊断 应用Mapper */ @Repository public interface DoctorStationDiagnosisAppMapper { + /** + * 查询诊断归属绑定列表 + * + * @param page 分页参数 + * @param bindingType1 个人类型 + * @param bindingType2 科室类型 + * @param queryWrapper 查询条件 + * @return 诊断归属绑定列表 + */ + IPage getDiagnosisBelongBindingPage(@Param("page") Page page, + @Param("bindingType1") Integer bindingType1, @Param("bindingType2") Integer bindingType2, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } 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 d3e8617f..02260247 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 @@ -4,5 +4,37 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java index 00a25c19..54773d62 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java @@ -1,6 +1,5 @@ package com.openhis.clinical.service.impl; -import com.core.common.core.domain.R; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;