diff --git a/lis-common/src/main/java/com/czlis/common/core/page/TableSupport.java b/lis-common/src/main/java/com/czlis/common/core/page/TableSupport.java index 0223d93..24e6bf6 100644 --- a/lis-common/src/main/java/com/czlis/common/core/page/TableSupport.java +++ b/lis-common/src/main/java/com/czlis/common/core/page/TableSupport.java @@ -2,12 +2,14 @@ package com.czlis.common.core.page; import com.czlis.common.core.text.Convert; import com.czlis.common.utils.ServletUtils; +import lombok.extern.slf4j.Slf4j; /** * 表格数据处理 * * @author admin */ +@Slf4j public class TableSupport { /** * 当前记录起始索引 @@ -39,6 +41,8 @@ public class TableSupport { */ public static PageDomain getPageDomain() { PageDomain pageDomain = new PageDomain(); + log.info("PAGE_NUM:{}", ServletUtils.getParameter(PAGE_NUM)); + log.info("PAGE_SIZE:{}", ServletUtils.getParameter(PAGE_SIZE)); pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/LisinterfaceNameConstants.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/LisinterfaceNameConstants.java index e1e878d..902bd03 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/LisinterfaceNameConstants.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/LisinterfaceNameConstants.java @@ -16,6 +16,10 @@ public class LisinterfaceNameConstants { public static final String DAYMESSAGE_EMR = "996"; //获取病人360视图 public static final String DAYMESSAGE_ALLPAT = "997"; + /** + * CDSS接口 + */ + public static final String DAYMESSAGE_CDSS = "998"; /** * 准备发送报告-5 */ diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java b/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java index 2051347..9741381 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java @@ -4,10 +4,11 @@ import com.czlis.common.annotation.Anonymous; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; -import com.czlis.zybgcx.pojo.Web_fs_printReport; -import com.czlis.zybgcx.pojo.Web_getReportsList; -import com.czlis.zybgcx.pojo.Web_getResultMed; -import com.czlis.zybgcx.pojo.Web_result; +import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; +import com.czlis.interfaceCommon.pojo.inter.DayMessage; +import com.czlis.interfaceCommon.utils.CommonUtil; +import com.czlis.interfaceCommon.utils.LisInterfaceUtil; +import com.czlis.zybgcx.pojo.*; import com.czlis.zybgcx.service.ZybgcxService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,6 +30,10 @@ public class ZybgcxController extends BaseController { @Autowired private ZybgcxService zybgcxService; + @Autowired + private LisInterfaceUtil lisInterfaceUtil; + @Autowired + private CommonUtil commonUtil; /** * 获取报告信息列表 @@ -37,10 +42,12 @@ public class ZybgcxController extends BaseController { */ @Anonymous @ApiOperation("获取报告信息列表") - @PostMapping("/ReportList") - public Result getPatReportList(@RequestBody Web_getReportsList webGetReportsList){ + @GetMapping("/ReportList") + public TableDataInfo getPatReportList(Web_getReportsList webGetReportsList){ log.info("获取报告信息列表:{}",webGetReportsList); - return zybgcxService.getPatList(webGetReportsList); + startPage(); + List webGetReportsListList = zybgcxService.getPatList(webGetReportsList); + return getDataTable(webGetReportsListList); } /** @@ -78,6 +85,13 @@ public class ZybgcxController extends BaseController { return zybgcxService.getFSResult(webFsPrintReport); } + @Anonymous + @ApiOperation("获取项目明细") + @GetMapping("/getSQDDetail") + public Result getSQDDetail(String sqh){ + return zybgcxService.getSQDDetail(sqh); + } + /** * 打印报告单 @@ -90,4 +104,19 @@ public class ZybgcxController extends BaseController { public Result printReport(@RequestBody String[] bgdh){ return zybgcxService.printReport(bgdh); } + + + @Anonymous + @ApiOperation("接口数据") + @PostMapping("/InterfaceData") + public Result getInterfaceData(@RequestBody DayMessageParamVO dayMessageParamVO){ + String CDSSInterface = commonUtil.getComOptValue("HISOPT", "CDSS_INTERFACE"); + if(CDSSInterface == null || "".equals(CDSSInterface)) return new Result("-1","CDSS接口未开通!"); + DayMessage dayMessage = new DayMessage(); + dayMessage.setMsgid(LisinterfaceNameConstants.DAYMESSAGE_CDSS); + dayMessage.setMsg(dayMessageParamVO.getMsg()); + dayMessage.setUserid(dayMessageParamVO.getUserId()); + dayMessage.setYljg(dayMessageParamVO.getYljg()); + return lisInterfaceUtil.invokeLisInterfaceLog(LisinterfaceNameConstants.DAYMESSAGE,dayMessage,dayMessageParamVO.getUserId()); + } } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java b/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java index 2ac4392..efd1738 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java @@ -1,5 +1,6 @@ package com.czlis.zybgcx.mapper; +import com.czlis.common.core.domain.entity.lis.LabReqdetail; import com.czlis.zybgcx.pojo.Web_fs_printReport; import com.czlis.zybgcx.pojo.Web_getReportsList; import com.czlis.zybgcx.pojo.Web_getResultMed; @@ -13,4 +14,6 @@ public interface ZybgcxMapper { List getLisResult(Web_result webResult); List getFSResult(Web_fs_printReport webFsPrintReport); + + List getSQDDetail(String sqh); } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/DayMessageParamVO.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/DayMessageParamVO.java new file mode 100644 index 0000000..836211c --- /dev/null +++ b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/DayMessageParamVO.java @@ -0,0 +1,14 @@ +package com.czlis.zybgcx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DayMessageParamVO { + private String msg; + private String userId; + private String yljg; +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java index 089f4a5..d1a1150 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java @@ -44,5 +44,9 @@ public class Web_getReportsList { private Date jssj; private Date confirmtime; private String lisgroup; + private String sqxmdh; + private String sqxmmc; + private String sfzh; + private String jgbz; } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getResultMed.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getResultMed.java index 91c67e6..36d6a02 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getResultMed.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getResultMed.java @@ -27,5 +27,6 @@ public class Web_getResultMed { private String bz; private String txtresult; private String textresult1; + private String sqxmdh; } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java b/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java index 9aecbb6..46457ba 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java @@ -10,7 +10,7 @@ import java.util.Date; import java.util.List; public interface ZybgcxService { - Result getPatList(Web_getReportsList webGetReportsList); + List getPatList(Web_getReportsList webGetReportsList); List getResultMed(Web_getResultMed webGetResultMed); Result printReport(String[] bgdh); @@ -20,4 +20,6 @@ public interface ZybgcxService { Result getLisResult(Web_result webResult); Result getFSResult(Web_fs_printReport webFsPrintReport); + + Result getSQDDetail(String sqh); } diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java b/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java index bc41d71..4342f36 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java @@ -7,6 +7,7 @@ import com.czlis.common.config.RuoYiConfig; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabPatInfo; +import com.czlis.common.core.domain.entity.lis.LabReqdetail; import com.czlis.common.core.domain.entity.lis.LabReqreportPdffile; import com.czlis.common.utils.file.FileUtils; import com.czlis.common.utils.uuid.UUID; @@ -50,9 +51,9 @@ public class ZybgcxServcieImpl implements ZybgcxService { * @return */ @Override - public Result getPatList(Web_getReportsList webGetReportsList) { + public List getPatList(Web_getReportsList webGetReportsList) { List reportsList = zybgcxMapper.getReportsList(webGetReportsList); - return new Result("0","查询成功!",reportsList); + return reportsList; } /** @@ -276,6 +277,12 @@ public class ZybgcxServcieImpl implements ZybgcxService { return new Result("0","获取数据成功!",fsResult); } + @Override + public Result getSQDDetail(String sqh) { + List labReqdetailList = zybgcxMapper.getSQDDetail(sqh); + return new Result("0","获取数据成功!",labReqdetailList); + } + public Result updatePrintStatus(String printId){ log.info("打印状态修改入参:"+printId); diff --git a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml index 44406f6..e3b6b3f 100644 --- a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml +++ b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml @@ -16,16 +16,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ch = #{ch} and jzbz = #{jzbz} and brlyname = #{brlyname} + and lisgroup = #{lisgroup} + and yq = #{yq} + and yblx = #{yblx} + and ybh = #{ybh} + and sqxmmc like '%'+#{sqxmmc}+'%' + + + \ No newline at end of file