住院报告查询需求修改

This commit is contained in:
jiangs 2026-05-28 16:14:20 +08:00
parent 63929ad397
commit 3d59678db6
10 changed files with 90 additions and 10 deletions

View File

@ -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));

View File

@ -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
*/

View File

@ -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<Web_getReportsList> 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());
}
}

View File

@ -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<Web_result> getLisResult(Web_result webResult);
List<Web_fs_printReport> getFSResult(Web_fs_printReport webFsPrintReport);
List<LabReqdetail> getSQDDetail(String sqh);
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -27,5 +27,6 @@ public class Web_getResultMed {
private String bz;
private String txtresult;
private String textresult1;
private String sqxmdh;
}

View File

@ -10,7 +10,7 @@ import java.util.Date;
import java.util.List;
public interface ZybgcxService {
Result getPatList(Web_getReportsList webGetReportsList);
List<Web_getReportsList> getPatList(Web_getReportsList webGetReportsList);
List<Web_getResultMed> 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);
}

View File

@ -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<Web_getReportsList> getPatList(Web_getReportsList webGetReportsList) {
List<Web_getReportsList> 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<LabReqdetail> labReqdetailList = zybgcxMapper.getSQDDetail(sqh);
return new Result("0","获取数据成功!",labReqdetailList);
}
public Result updatePrintStatus(String printId){
log.info("打印状态修改入参:"+printId);

View File

@ -16,16 +16,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="ch != null and ch !=''"> and ch = #{ch}</if>
<if test="jzbz != null">and jzbz = #{jzbz}</if>
<if test="brlyname != null and brlyname != ''"> and brlyname = #{brlyname}</if>
<if test="lisgroup != null and lisgroup != ''"> and lisgroup = #{lisgroup}</if>
<if test="yq != null and yq != ''"> and yq = #{yq}</if>
<if test="yblx != null and yblx != ''"> and yblx = #{yblx}</if>
<if test="ybh != null and ybh != ''"> and ybh = #{ybh}</if>
<if test="sqxmmc != null and sqxmmc != ''"> and sqxmmc like '%'+#{sqxmmc}+'%'</if>
</select>
<select id="getResultMed" resultType="com.czlis.zybgcx.pojo.Web_getResultMed">
select * from web_getresultmed where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
<if test="xmdh != null and xmdh != ''"> and xmdh = #{xmdh}</if>
<if test="sqxmdh != null and sqxmdh != ''"> and sqxmdh = #{sqxmdh}</if>
</select>
<select id="getLisResult" resultType="com.czlis.zybgcx.pojo.Web_result">
select * from web_result where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
<if test="xmdh != null and xmdh != ''"> and xmdh = #{xmdh}</if>
<if test="sqxmdh != null and sqxmdh != ''"> and sqxmdh = #{sqxmdh}</if>
</select>
<select id="getFSResult" resultType="com.czlis.zybgcx.pojo.Web_fs_printReport">
@ -37,5 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by bgdh
</select>
<select id="getSQDDetail" resultType="com.czlis.common.core.domain.entity.lis.LabReqdetail">
select * from lab_reqdetail a where a.sqh = #{sqh}
</select>
</mapper>