From 2a8fa0dcb82533610acac9366f1d6d8ea2ce854b Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Fri, 1 Sep 2023 15:57:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docus/server/collect/entity/TBasic.java | 14 ++++++++++++++ .../infrastructure/dao/DownloadTaskDao.java | 18 +++++++++++------- .../dao/impl/DownloadTaskDaoImpl.java | 5 ++--- .../mapper/DownloadTaskMapper.java | 7 +++---- .../service/impl/FileReportServiceImpl.java | 3 ++- src/main/resources/mapper/TBasicMapper.xml | 11 +++++++---- 6 files changed, 39 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/docus/server/collect/entity/TBasic.java b/src/main/java/com/docus/server/collect/entity/TBasic.java index 4052f19..1a7b6f9 100644 --- a/src/main/java/com/docus/server/collect/entity/TBasic.java +++ b/src/main/java/com/docus/server/collect/entity/TBasic.java @@ -1,5 +1,6 @@ package com.docus.server.collect.entity; +import com.docus.server.collect.service.dto.ReportFileInfoDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,4 +33,17 @@ public class TBasic { private String name; @ApiModelProperty(value = "住院id") private String admissId; + @ApiModelProperty(value = "省中医患者主索引号") + private String empId; + + public TBasic() { + } + + public TBasic(ReportFileInfoDTO fileInfoDTO) { + this.jzh = fileInfoDTO.getJzh(); + this.patientId = fileInfoDTO.getPatientId(); + this.inpatientNo = fileInfoDTO.getInpatientNo(); + this.admissTimes = fileInfoDTO.getAdmisstimes(); + ; + } } diff --git a/src/main/java/com/docus/server/collect/infrastructure/dao/DownloadTaskDao.java b/src/main/java/com/docus/server/collect/infrastructure/dao/DownloadTaskDao.java index 964d35f..5f16418 100644 --- a/src/main/java/com/docus/server/collect/infrastructure/dao/DownloadTaskDao.java +++ b/src/main/java/com/docus/server/collect/infrastructure/dao/DownloadTaskDao.java @@ -3,25 +3,27 @@ package com.docus.server.collect.infrastructure.dao; import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.server.collect.entity.DownloadTask; import com.docus.server.collect.entity.TBasic; -import com.docus.server.collect.service.dto.ReportFileInfoDTO; import java.util.List; /** * 下载任务表-数据访问接口 + * * @author wyb */ public interface DownloadTaskDao extends IBaseDao { /** - * 根据上报文件信息中的患者信息，查询患者基础数据 - * @param fileInfoDTO 上报文件信息 + * 根据患者信息，查询患者基础数据 + * + * @param tBasic 患者基础信息 * @return 患者基础数据 */ - List getBasicInfo(ReportFileInfoDTO fileInfoDTO); + List getBasicInfo(TBasic tBasic); /** * 从下载任务表中获取下载任务id，来源，采文件唯一标识，和患者信息 + * * @param downloadTask 下载任务 * @return 下载任务id（也是文件id） */ @@ -29,17 +31,19 @@ public interface DownloadTaskDao extends IBaseDao { /** * 根据病案的来源，病案文件的唯一标识，从文件表得到文件下载任务id（也是文件id） + * * @param patientId 病案主键 - * @param source 来源 + * @param source 来源 * @param serialNum 文件唯一标识 * @return 下载任务id（也是文件id） */ Long getDownloadTaskIdFromSanAssort(String patientId, String source, String serialNum); /** - * 根据病案的来源，病案文件的唯一标识，从下载记录表得到文件下载任务id（也是文件id） + * 根据病案的来源，病案文件的唯一标识，从下载记录表得到文件下载任务id（也是文件id） + * * @param patientId 病案主键 - * @param source 来源 + * @param source 来源 * @param serialNum 文件唯一标识 * @return 下载任务id（也是文件id） */ diff --git a/src/main/java/com/docus/server/collect/infrastructure/dao/impl/DownloadTaskDaoImpl.java b/src/main/java/com/docus/server/collect/infrastructure/dao/impl/DownloadTaskDaoImpl.java index a825b0e..0f09a61 100644 --- a/src/main/java/com/docus/server/collect/infrastructure/dao/impl/DownloadTaskDaoImpl.java +++ b/src/main/java/com/docus/server/collect/infrastructure/dao/impl/DownloadTaskDaoImpl.java @@ -7,7 +7,6 @@ import com.docus.server.collect.entity.DownloadTask; import com.docus.server.collect.entity.TBasic; import com.docus.server.collect.infrastructure.dao.DownloadTaskDao; import com.docus.server.collect.infrastructure.mapper.DownloadTaskMapper; -import com.docus.server.collect.service.dto.ReportFileInfoDTO; import org.springframework.stereotype.Repository; import java.util.List; @@ -20,8 +19,8 @@ import java.util.List; @Repository public class DownloadTaskDaoImpl extends BaseDaoImpl implements DownloadTaskDao { @Override - public List getBasicInfo(ReportFileInfoDTO fileInfoDTO) { - return baseMapper.getBasicInfo(fileInfoDTO); + public List getBasicInfo(TBasic basic) { + return baseMapper.getBasicInfo(basic); } @Override diff --git a/src/main/java/com/docus/server/collect/infrastructure/mapper/DownloadTaskMapper.java b/src/main/java/com/docus/server/collect/infrastructure/mapper/DownloadTaskMapper.java index 497bd8e..aaa1357 100644 --- a/src/main/java/com/docus/server/collect/infrastructure/mapper/DownloadTaskMapper.java +++ b/src/main/java/com/docus/server/collect/infrastructure/mapper/DownloadTaskMapper.java @@ -3,7 +3,6 @@ package com.docus.server.collect.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.docus.server.collect.entity.DownloadTask; import com.docus.server.collect.entity.TBasic; -import com.docus.server.collect.service.dto.ReportFileInfoDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,12 +11,12 @@ import java.util.List; @Mapper public interface DownloadTaskMapper extends BaseMapper { /** - * 根据上报文件的患者信息获取基础病案信息 from `docus_medicalrecord`.`t_basic` + * 根据患者信息获取基础病案信息 from `docus_medicalrecord`.`t_basic` * - * @param fileInfoDTO 上报文件信息 + * @param tBasic 患者基础信息 * @return 病案基础信息 */ - List getBasicInfo(@Param("dto") ReportFileInfoDTO fileInfoDTO); + List getBasicInfo(@Param("basic") TBasic tBasic); /** * 根据病案的来源，病案文件的唯一标识，从文件表得到文件下载任务id（也是文件id） * @param patientId 病案主键 diff --git a/src/main/java/com/docus/server/collect/service/impl/FileReportServiceImpl.java b/src/main/java/com/docus/server/collect/service/impl/FileReportServiceImpl.java index a7d6209..d7cd289 100644 --- a/src/main/java/com/docus/server/collect/service/impl/FileReportServiceImpl.java +++ b/src/main/java/com/docus/server/collect/service/impl/FileReportServiceImpl.java @@ -42,8 +42,9 @@ public class FileReportServiceImpl implements FileReportService { @Override public void saveDownloadTaskAndReport(ReportFileInfoDTO fileInfoDTO) { + TBasic basic = new TBasic(fileInfoDTO); // 查询基础数据，更新新的病案信息 - List tBasics = downloadTaskDao.getBasicInfo(fileInfoDTO); + List tBasics = downloadTaskDao.getBasicInfo(basic); // 如果找到患者基础数据，并且刚好为1条 if (CollUtil.isNotEmpty(tBasics) && tBasics.size() == 1) { TBasic tBasic = tBasics.get(0); diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index fdb263d..ed41279 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -21,16 +21,19 @@ WHERE is_cancel=0 - and `patient_id` = #{dto.patientId} + and `patient_id` = #{basic.patientId} - and `jzh` = #{dto.jzh} + and `jzh` = #{basic.jzh} + + + and `emp_id` = #{basic.empId} - and `inpatient_no` = #{dto.inpatientNo} + and `inpatient_no` = #{basic.inpatientNo} - and `admiss_times` = #{dto.admisstimes} + and `admiss_times` = #{basic.admissTimes} limit 2