diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegLisReportController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegLisReportController.java new file mode 100644 index 0000000..513b3cc --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegLisReportController.java @@ -0,0 +1,50 @@ +package com.transitPlatForm.transitPF.controller; + +import com.transitPlatForm.common.core.controller.BaseController; +import com.transitPlatForm.common.core.page.TableDataInfo; +import com.transitPlatForm.transitPF.mapper.RegLisReportMapper; +import com.transitPlatForm.transitPF.pojo.RegGetReportsList; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * 区域检验中心,检验报告查询 + */ +@Api(tags = "区域检验中心-检验报告查询") +@RestController +@RequestMapping("/transitLisReport") +@Slf4j +public class RegLisReportController extends BaseController { + + @Autowired + RegLisReportMapper regLisReportMapper; + + @ApiOperation("检验报告数据") + @GetMapping("/lisReportList") + public TableDataInfo getLisReportList(RegGetReportsList regGetReportsList){ + startPage(); + List> lisReportList = regLisReportMapper.getLisReportList(regGetReportsList); + return getDataTable(lisReportList); + } + + @ApiOperation("获取报告明细数据") + @GetMapping("/reportDetail") + public List> getLisReportDetail(String bgdh){ + return regLisReportMapper.getLisReportDetail(bgdh); + } + + @ApiOperation("获取细菌报告数据") + @GetMapping("/reportDetailMed") + public List> getRegGetresultmed(String bgdh,String xmdh){ + return regLisReportMapper.getRegGetresultmed(bgdh,xmdh); + } + +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegLisReportMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegLisReportMapper.java new file mode 100644 index 0000000..1099692 --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegLisReportMapper.java @@ -0,0 +1,14 @@ +package com.transitPlatForm.transitPF.mapper; + + +import com.transitPlatForm.transitPF.pojo.RegGetReportsList; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface RegLisReportMapper { + List> getLisReportList(RegGetReportsList regGetReportsList); + List> getLisReportDetail(String bgdh); + List> getRegGetresultmed(@Param("bgdh") String bgdh ,@Param("xmdh") String xmdh); +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegGetReportsList.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegGetReportsList.java new file mode 100644 index 0000000..da4e23f --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegGetReportsList.java @@ -0,0 +1,47 @@ +package com.transitPlatForm.transitPF.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegGetReportsList { + private String yljg; + private Date jyrq; + private String jyrqname; + private String yq; + private String ybh; + private String yblx; + private String brxm; + private String brdh; + private String ch; + private String zd; + private String sqh; + private String ksdh; + private String jzbz; + private String alarmflag; + private String dybz; + private String nl; + private String ksname; + private String brlyname; + private String brxbname; + private String yblxname; + private String sjysname; + private String yqmc; + private String yqdl; + private String sqdh; + private String jymd; + private String st; + private String et; + private Date sqsj; + private Date cysj; + private Date zxsj; + private Date bbsjsj; + private Date jssj; + private Date confirmtime; + private String lisgroup; +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java index 1488948..895112b 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java @@ -567,7 +567,19 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { String patId = regRequestInfoDTO.getPatId(); String loginYLJG = SecurityUtils.getLoginUser().getSysLoginParam().getLoginYLJG(); RegApply regApply = regRequestInfoMapper.getPatInfo(patId, loginYLJG); - return new Result("0","查询数据成功!",regApply); + RegApply regApply1 = new RegApply(); + regApply1.setPatId(regApply.getPatId()); + regApply1.setPatType(regApply.getPatType()); + regApply1.setPatName(regApply.getPatName()); + regApply1.setPatSex(regApply.getPatSex()); + regApply1.setPatAge(regApply.getPatAge()); + regApply1.setAgeUnit(regApply.getAgeUnit()); + regApply1.setPatBirthday(regApply.getPatBirthday()); + regApply1.setPhone(regApply.getPhone()); + regApply1.setAddress(regApply.getAddress()); + regApply1.setDiagnosisCode(regApply.getDiagnosisCode()); + regApply1.setDiagnosisName(regApply.getDiagnosisName()); + return new Result("0","查询数据成功!",regApply1); } private String getLocalid() { diff --git a/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml new file mode 100644 index 0000000..0e81e9b --- /dev/null +++ b/pf_transitPF/src/main/resources/mapper/RegLisReportMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + \ No newline at end of file