diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfoimportmain/PatientInfoImportMainController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfoimportmain/PatientInfoImportMainController.java new file mode 100644 index 00000000..1f237aaf --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfoimportmain/PatientInfoImportMainController.java @@ -0,0 +1,45 @@ +package com.xinelu.manage.controller.patientinfoimportmain; + + +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.manage.domain.patientinfoimportmain.PatientInfoImportMain; +import com.xinelu.manage.service.patientinfoimportmain.IPatientInfoImportMainService; +import com.xinelu.manage.vo.patientinfoimportmain.PatientInfoImportMainVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 患者信息Controller + * + * @author zyk + * @date 2024-11-27 + */ +@RestController +@RequestMapping("/manage/patientInfoimportmain") +@Api(tags = "患者导入信息控制器") +public class PatientInfoImportMainController extends BaseController { + + + @Resource + IPatientInfoImportMainService patientInfoImportMainService ; + /** + * 查询患者信息列表 + */ + @ApiOperation("查询患者导入信息列表") + // @PreAuthorize("@ss.hasPermi('manage:patientInfoimporttemp:list')") + @GetMapping("/list") + public TableDataInfo list(PatientInfoImportMainVO patientInfoImportMainVO) { + startPage(); + List list = patientInfoImportMainService.GetPatientInfoImport(patientInfoImportMainVO); + return getDataTable(list); + } + + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java index 37d41473..0594aa3b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfoimportmain/PatientInfoImportMainMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.patientinfoimportmain; import com.xinelu.manage.domain.patientinfoimportmain.PatientInfoImportMain; +import com.xinelu.manage.vo.patientinfoimportmain.PatientInfoImportMainVO; import java.util.List; @@ -19,6 +20,13 @@ public interface PatientInfoImportMainMapper { */ PatientInfoImportMain selectPatientInfoImportMainById(Long id); + // @Select("SELECT p.sn,count( 1 ) AS patientcount,DATE_FORMAT( p.create_time, '%Y-%m-%d' ) AS createTime,p.create_by FROM patient_info_import p GROUP BY p.sn,DATE_FORMAT( p.create_time, '%Y-%m-%d' ),p.create_by") + // @Select("select * from patient_info") + // @DataSource(value = DataSourceType.HKHIS) + List GetPatientInfoImport(PatientInfoImportMainVO patientInfoImport2VO); + + + /** * 查询患者导入记录列表 * diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfoimportmain/IPatientInfoImportMainService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfoimportmain/IPatientInfoImportMainService.java new file mode 100644 index 00000000..600751d4 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfoimportmain/IPatientInfoImportMainService.java @@ -0,0 +1,12 @@ +package com.xinelu.manage.service.patientinfoimportmain; + + +import com.xinelu.manage.vo.patientinfoimportmain.PatientInfoImportMainVO; + +import java.util.List; + +public interface IPatientInfoImportMainService { + + List GetPatientInfoImport(PatientInfoImportMainVO patientInfoImportMainVO); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfoimportmain/impl/PatientInfoImportMainServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfoimportmain/impl/PatientInfoImportMainServiceImpl.java new file mode 100644 index 00000000..8c7dd158 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfoimportmain/impl/PatientInfoImportMainServiceImpl.java @@ -0,0 +1,32 @@ +package com.xinelu.manage.service.patientinfoimportmain.impl; + +import com.xinelu.common.annotation.DataScope; +import com.xinelu.manage.mapper.patientinfoimportmain.PatientInfoImportMainMapper; +import com.xinelu.manage.service.patientinfoimportmain.IPatientInfoImportMainService; +import com.xinelu.manage.vo.patientinfoimportmain.PatientInfoImportMainVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + + +@Service +public class PatientInfoImportMainServiceImpl implements IPatientInfoImportMainService { + + @Resource + PatientInfoImportMainMapper patientInfoImportMainMapper; + + @DataScope(agencyAlias = "p") + @Override + public List GetPatientInfoImport(PatientInfoImportMainVO patientInfoImport2VO) + { + List list = new ArrayList<>(); + + list = patientInfoImportMainMapper.GetPatientInfoImport(patientInfoImport2VO); + + return list; + + } + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfoimportmain/PatientInfoImportMainVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfoimportmain/PatientInfoImportMainVO.java new file mode 100644 index 00000000..340d544a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfoimportmain/PatientInfoImportMainVO.java @@ -0,0 +1,71 @@ +package com.xinelu.manage.vo.patientinfoimportmain; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Data +public class PatientInfoImportMainVO extends BaseEntity { + + /** $column.columnComment */ + private Long id; + + /** 附件名称 */ + @ApiModelProperty(value = "附件名称") + private String fileName; + + /** 已随访：FOLLOWED;未随访：NOT_FOLLOWED；PARTIAL_FOLLOWED */ + @ApiModelProperty(value = "已随访：FOLLOWED;未随访：NOT_FOLLOWED；PARTIAL_FOLLOWED") + private String followupStatus; + + /** 已随访人数 */ + @ApiModelProperty(value = "已随访人数") + private Long followupCount; + + /** 流水号 */ + @ApiModelProperty(value = "流水号") + private Long sn; + + /** 患者数量 */ + @ApiModelProperty(value = "患者数量") + private String patientCount; + + + /** 导入人员 */ + @ApiModelProperty(value = "导入人员") + private String createBy; + + /** + * 导入日期 + */ + @ApiModelProperty(value = "导入日期时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @ApiModelProperty(value = "机构ID") + private Long hospitalAgencyId; + + @ApiModelProperty(value = "机构名称") + private String hospitalAgencyName; + + @ApiModelProperty(value = "院区ID") + private Long campusAgencyId; + + + /** 开始导入时间，时间格式：yyyy-MM-dd */ + @ApiModelProperty(value = "开始导入时间，时间格式：yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate importTimeStart; + + /** 导入时间，时间格式：yyyy-MM-dd */ + @ApiModelProperty(value = "截止导入时间，时间格式：yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate importTimeEnd; + +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml index a94aebf3..a5900911 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfoimportmain/PatientInfoImportMainMapper.xml @@ -15,7 +15,17 @@ - + + + + + + + + + + + select id, sn, create_time, create_by, hospital_agency_id, hospital_agency_name, file_name, followup_status, followup_count from patient_info_import_main @@ -43,7 +53,32 @@ +