diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java index ce77a2e..05753fa 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java @@ -2,17 +2,22 @@ package com.transitPlatForm.transitPF.controller; import com.transitPlatForm.common.core.controller.BaseController; import com.transitPlatForm.common.core.page.TableDataInfo; +import com.transitPlatForm.common.utils.poi.ExcelUtil; import com.transitPlatForm.transitPF.mapper.RegReportMapper; import com.transitPlatForm.transitPF.pojo.DTO.RegItemVO; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample; +import com.transitPlatForm.transitPF.pojo.VO.ItemReportInfoVO; +import com.transitPlatForm.transitPF.pojo.VO.SampleReportInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -33,7 +38,7 @@ public class RegReportController extends BaseController { @GetMapping("/sampleTypeCount") public TableDataInfo getSampleTypeCount(RegTransitSample regTransitSample){ startPage(); - List> sampleTypeCountList = regReportMapper.getSampleTypeCount(regTransitSample); + List sampleTypeCountList = regReportMapper.getSampleTypeCount(regTransitSample); return getDataTable(sampleTypeCountList); } @@ -41,7 +46,24 @@ public class RegReportController extends BaseController { @GetMapping("/itemCount") public TableDataInfo getItemCount(RegItemVO regItemVO){ startPage(); - List> itemCountList = regReportMapper.getItemCount(regItemVO); + List itemCountList = regReportMapper.getItemCount(regItemVO); return getDataTable(itemCountList); } + + @ApiOperation("导出样本数据") + @PostMapping("/exportSample") + public void exportSample(HttpServletResponse response, RegTransitSample regTransitSample){ + List sampleReportInfoVOList = regReportMapper.getSampleTypeCount(regTransitSample); + ExcelUtil util = new ExcelUtil<>(SampleReportInfoVO.class); + util.exportExcel(response, sampleReportInfoVOList, "样本统计数据"); + } + + @ApiOperation("导出项目数据") + @PostMapping("/exportItem") + public void exportItem(HttpServletResponse response, RegItemVO regItemVO){ + List itemReportInfoVOList = regReportMapper.getItemCount(regItemVO); + ExcelUtil util = new ExcelUtil<>(ItemReportInfoVO.class); + util.exportExcel(response, itemReportInfoVOList, "项目统计数据"); + } + } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java index 409fb8a..5df4587 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java @@ -2,11 +2,13 @@ package com.transitPlatForm.transitPF.mapper; import com.transitPlatForm.transitPF.pojo.DTO.RegItemVO; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample; +import com.transitPlatForm.transitPF.pojo.VO.ItemReportInfoVO; +import com.transitPlatForm.transitPF.pojo.VO.SampleReportInfoVO; import java.util.List; import java.util.Map; public interface RegReportMapper { - List> getSampleTypeCount(RegTransitSample regTransitSample); - List> getItemCount(RegItemVO regItemVO); + List getSampleTypeCount(RegTransitSample regTransitSample); + List getItemCount(RegItemVO regItemVO); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/VO/ItemReportInfoVO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/VO/ItemReportInfoVO.java new file mode 100644 index 0000000..3c00b16 --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/VO/ItemReportInfoVO.java @@ -0,0 +1,24 @@ +package com.transitPlatForm.transitPF.pojo.VO; + +import com.transitPlatForm.common.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ItemReportInfoVO { + @Excel(name = "委托机构", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "委托机构") + private String SrcHospName; + @Excel(name = "收费项目代码", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "收费项目代码") + private String SrcOrderItemCode; + @Excel(name = "收费项目名称", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "收费项目名称") + private String SrcOrderItemName; + @Excel(name = "数量", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "数量") + private String sl; + @Excel(name = "金额", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "金额") + private String cost; + @Excel(name = "检测机构", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "检测机构") + private String DstHospName; +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/VO/SampleReportInfoVO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/VO/SampleReportInfoVO.java new file mode 100644 index 0000000..18b1600 --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/VO/SampleReportInfoVO.java @@ -0,0 +1,20 @@ +package com.transitPlatForm.transitPF.pojo.VO; + +import com.transitPlatForm.common.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SampleReportInfoVO { + @Excel(name = "委托机构", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "委托机构") + private String srchospname; + @Excel(name = "标本代码", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "标本代码") + private String sampletypecode; + @Excel(name = "标本名称", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "标本名称") + private String sampletypename; + @Excel(name = "数量", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.STRING, prompt = "数量") + private String sl; +} diff --git a/pf_transitPF/src/main/resources/mapper/RegReportMapper.xml b/pf_transitPF/src/main/resources/mapper/RegReportMapper.xml index 7eeedaf..f1a679c 100644 --- a/pf_transitPF/src/main/resources/mapper/RegReportMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegReportMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select srchospname,sampletypecode,sampletypename,count(1) as sl from reg_TransitSample and SrcHospName = #{SrcHospName} @@ -15,7 +15,7 @@ group by srchospname,sampletypecode,sampletypename - select a.SrcHospName,isnull(b.SrcOrderItemCode,b.orderitemcode) as SrcOrderItemCode,isnull(b.SrcOrderItemName,b.orderitemname) as SrcOrderItemName ,count(1) as sl,b.cost,a.DstHospName from reg_TransitSample a,reg_TransitSample_detail b where a.barcode = b.barcode and SrcHospName = #{SrcHospName} and SrcOrderItemCode like '%'+#{SrcOrderItemCode}+'%'