diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/dto/BatchPrintDTO.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/dto/BatchPrintDTO.java new file mode 100644 index 0000000..5ccb841 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/dto/BatchPrintDTO.java @@ -0,0 +1,18 @@ +package com.czlis.interfaceCommon.pojo.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BatchPrintDTO{ + private Date jyrq; + private String yq; + private String ybh; + private String flag; + private String msg; +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java index 46bfd99..894d3fc 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java @@ -5,25 +5,19 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.czlis.common.annotation.Async; import com.czlis.common.annotation.Log; import com.czlis.common.asyncmanager.AsyncManager; import com.czlis.common.config.RuoYiConfig; +import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.SysOperLog; -import com.czlis.common.core.domain.entity.SysUser; -import com.czlis.common.core.domain.model.LoginUser; -import com.czlis.common.core.text.Convert; import com.czlis.common.enums.BusinessStatus; import com.czlis.common.enums.BusinessType; -import com.czlis.common.utils.ExceptionUtil; -import com.czlis.common.utils.SecurityUtils; import com.czlis.common.utils.ServletUtils; import com.czlis.common.utils.StringUtils; import com.czlis.common.utils.ip.AddressUtils; import com.czlis.common.utils.ip.IpUtils; import com.czlis.common.utils.spring.SpringUtils; import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; -import com.czlis.common.core.domain.Result; import com.czlis.interfaceCommon.mapper.LisInterfaceMapper; import com.czlis.interfaceCommon.service.ISysOperLogService; import com.czlis.interfaceCommon.service.LisInterfaceType; @@ -33,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.TimerTask; diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java index 1682ced..d51db73 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java @@ -1,7 +1,7 @@ package com.czlis.interfaceCommon.utils; import cn.hutool.core.codec.Base64; -import com.czlis.common.utils.DateUtils; +import cn.hutool.core.util.StrUtil; import com.lowagie.text.Document; import com.lowagie.text.pdf.PdfCopy; import com.lowagie.text.pdf.PdfReader; @@ -762,4 +762,115 @@ public class LisUtil { } return null; } + /** + * 通过样本号范围集合获取样本号查询条件（SQL Server专用，右补20空格对齐比较） + * + * @param code 样本号字段别名，白名单校验：仅允许字母数字._，如 ybh; a.ybh;lab_pat.ybh + * @param input 样本号范围集合,支持逗号分隔、区间符-，示例：1,2,3-10,100-200 + * @return 拼接好的where条件片段，空输入返回空串 + */ + public static String getYbhWhere(String code, String input) { + // 1. 空输入直接返回 + if (StrUtil.isBlank(input)) { + return ""; + } + // 字段白名单校验：仅允许 字母、数字、下划线、点、表别名 + if (!code.matches("^[a-zA-Z0-9_.]+$")) { + throw new IllegalArgumentException("样本号字段别名非法，仅允许字母数字._"); + } + // 统一中文逗号转英文逗号，去除首尾空格 + input = input.trim().replace("，", ",").replaceAll("--","-"); + String[] splitArr = StrUtil.splitToArray(input, ","); + + // 存储等值单值、区间条件 + List eqList = new ArrayList<>(); + StringBuilder rangeSb = new StringBuilder(); + + String colWrap = getBankYbhWrap(code); + + for (String seg : splitArr) { + String segTrim = seg.trim(); + if (StrUtil.isBlank(segTrim)) { + continue; + } + // 区间段处理 + if (segTrim.contains("-")) { + String[] rangePair = StrUtil.splitToArray(segTrim, "-"); + // 必须两段，过滤 3--5、-10、5- 这类非法区间 + if (rangePair.length != 2 || StrUtil.isBlank(rangePair[0]) || StrUtil.isBlank(rangePair[1])) { + continue; + } + String low = rangePair[0].trim(); + String high = rangePair[1].trim(); + // 下限大于上限直接跳过该区间 +// if (low.compareTo(high) > 0) { +// continue; +// } + // 拼接区间条件，用参数占位防注入（适配MyBatis $+# 分离） + String rangeCond = String.format("(%s >= %s AND %s <= %s)", + colWrap, getBankYbhWrapParam(low), colWrap, getBankYbhWrapParam(high)); + if (rangeSb.length() > 0) { + rangeSb.append(" OR "); + } + rangeSb.append(rangeCond); + } else { + // 等值单值 + eqList.add(segTrim); + } + } + + // 组装等值条件 + StringBuilder eqSb = new StringBuilder(); + if (!eqList.isEmpty()) { + if (eqList.size() == 1) { + // 单个等值：code = #{param} + eqSb.append(String.format("%s = %s", code, eqList.get(0))); + } else { + // 多个in：code IN (#{p1},#{p2},...) + eqSb.append(code).append(" IN ("); + for (int i = 0; i < eqList.size(); i++) { + if (i > 0) { + eqSb.append(","); + } + eqSb.append(eqList.get(i)); + } + eqSb.append(")"); + } + } + + String eqSql = eqSb.toString(); + String rangeSql = rangeSb.toString(); + + // 合并最终条件 + if (StrUtil.isNotBlank(eqSql) && StrUtil.isNotBlank(rangeSql)) { + return String.format("(%s OR (%s))", eqSql, rangeSql); + } else if (StrUtil.isNotBlank(eqSql)) { + return eqSql; + } else if (StrUtil.isNotBlank(rangeSql)) { + return String.format("(%s)", rangeSql); + } + return ""; + } + + /** + * 生成对齐包装字段：right(replicate(' ',20) + 字段,20) + */ + private static String getBankYbhWrap(String colCode) { + return String.format("right(replicate(' ',20) + %s,20)", colCode); + } + + /** + * 生成对齐包装参数（MyBatis预编译占位，防SQL注入） + * 业务层配合：拼接后用MyBatis #{}接收参数，禁止直接拼接单引号字符串 + * @param val 样本号值 + * @return 带对齐函数的参数占位 + */ + private static String getBankYbhWrapParam(String val) { + // 方案1：MyBatis环境推荐，返回占位符，外部传入参数Map + // return String.format("right(replicate(' ',20) + #{ybh_%s},20)", val); + + // 方案2：若必须直接拼接字符串（不推荐，仅兼容旧逻辑），转义单引号 + String safeVal = val.replace("'", "''"); + return String.format("right(replicate(' ',20) + '%s',20)", safeVal); + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java index 8ec7d63..4e767b6 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java @@ -3,18 +3,21 @@ package com.czlis.interfaceCommon.utils; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.czlis.common.config.RuoYiConfig; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.ComReportInstr; import com.czlis.common.core.domain.entity.lis.LabGraph; import com.czlis.common.core.domain.entity.lis.LabPat; +import com.czlis.common.core.domain.entity.lis.LabReqreportPdffile; import com.czlis.common.utils.file.FileUtils; import com.czlis.common.utils.file.ImageUtils; import com.czlis.common.utils.ip.IpUtils; import com.czlis.common.utils.uuid.UUID; import com.czlis.interfaceCommon.mapper.BackPaperMapper; import com.czlis.interfaceCommon.mapper.LabReportvsitemMapper; +import com.czlis.interfaceCommon.pojo.dto.BatchPrintDTO; import com.czlis.interfaceCommon.pojo.entity.BackPaperDetail; import com.czlis.interfaceCommon.pojo.entity.BackPaperParam; import com.czlis.interfaceCommon.pojo.entity.LabRptgetruledetailCX; @@ -64,7 +67,7 @@ public class ReportUtil { public void printBarCode(ReportParam mzReportParam) { - Map parameters=new HashMap<>(); + Map parameters = new HashMap<>(); parameters.put("barcode", mzReportParam.getSqh()); parameters.put("line1", mzReportParam.getBrxm() + " " + mzReportParam.getBrxb() + " " + mzReportParam.getNl()); parameters.put("line2", mzReportParam.getSfxmmc()); @@ -72,7 +75,7 @@ public class ReportUtil { //构造数据 JasperReportUtil.print(RuoYiConfig.getMzPrintName(), "barcode", parameters); } catch (Exception e) { - e.printStackTrace(); + e.printStackTrace(); log.error("打印条码报错,条码号：{}", mzReportParam.getSqh(), e); } } @@ -124,29 +127,25 @@ public class ReportUtil { } public Result printToPdf(String templatename, ReportParam reportParam, String pdfName, boolean base64) { - String staticpath=ImageUtils.getStaticPath()+ File.separator; + String staticpath = ImageUtils.getStaticPath() + File.separator; String pdfName1 = UUID.randomUUID().toString(); - String outputPath = staticpath+ File.separator + "printPDF"+ File.separator + pdfName1 + ".pdf"; // PDF输出路径（多级目录会自动创建） + String outputPath = staticpath + "printPDF" + File.separator + pdfName1 + ".pdf"; Map stringObjectMap = BeanUtil.beanToMap(reportParam); - try { - Connection connection = dataSource.getConnection(); + try (Connection connection = dataSource.getConnection()) { JasperReportUtil.exportToPdf(templatename, stringObjectMap, connection, outputPath); } catch (Exception e) { - e.printStackTrace(); log.error("打印条码失败,参数{}", reportParam, e); } String httpPath = getPrintURL(pdfName1); log.info("传给前端的pdf地址：{}", httpPath); if (base64) { - //删除图片文件 String[] pic = reportParam.getPic(); - if(pic != null){ + if (pic != null) { for (String s : pic) { String picFilePath = staticpath + File.separator + "graphs" + File.separator + StrUtil.splitToArray(s, "graphs/")[1]; FileUtils.deleteFile(picFilePath); } } - //删除最后给前端的pdf文件 File file = new File(outputPath); String data = ""; if (file.exists()) { @@ -157,12 +156,12 @@ public class ReportUtil { } else { return new Result("0", "打印成功！", httpPath); } - } public String getPrintURL(String pdfName) { - return getHttpURL("printPDF")+"/"+pdfName+".pdf"; + return getHttpURL("printPDF") + "/" + pdfName + ".pdf"; } + public String getHttpURL(String pathChild) { String httpPath; if (printURL == null || printURL.isEmpty()) { @@ -177,8 +176,8 @@ public class ReportUtil { * 判断当前报告单是否使用A4报告单 * * @param jyrq 检验日期 - * @param yq 仪器 - * @param ybh 样本号 + * @param yq 仪器 + * @param ybh 样本号 * @return 返回纸张格式 */ public String getReportPaperSize(Date jyrq, String yq, String ybh) { @@ -343,10 +342,13 @@ public class ReportUtil { return printReport(commonUtil.getLabPatOne(jyrq, yq, ybh)); } public Result printReport(LabPat labPat) { + return printReport(labPat,true); + } + public Result printReport(LabPat labPat,boolean base64) { Date jyrq = labPat.getJyrq(); String yq = labPat.getYq(); String ybh = labPat.getYbh(); - String yljg=commonUtil.getLabInstr(yq).getYljg(); + String yljg = commonUtil.getLabInstr(yq).getYljg(); String hospitalName = commonUtil.getCompany(yljg); ReportParam reportParam = new ReportParam(); reportParam.setJyrq(jyrq); @@ -358,67 +360,86 @@ public class ReportUtil { reportParam.setCheckercbpic(getSignName(labPat.getChecker())); //初审者 String[] picPath = getReportpic(jyrq, yq, ybh); reportParam.setPic(picPath); - ComReportInstr comReportInstr=getReportTemplate(jyrq, yq, ybh); - if(comReportInstr==null) { - return new Result("-1","未找到打印模板,请检查报告单设置"); + ComReportInstr comReportInstr = getReportTemplate(jyrq, yq, ybh); + if (comReportInstr == null) { + return new Result("-1", "未找到打印模板,请检查报告单设置"); } - if(comReportInstr.getReportId()==null) { - return new Result("-1","未找到打印模板,请检查报告单设置"); + if (comReportInstr.getReportId() == null) { + return new Result("-1", "未找到打印模板,请检查报告单设置"); } reportParam.setReportRows(comReportInstr.getReportRows()); - Integer count=labReportvsitemMapper.getLabReportCount(jyrq,yq,ybh); - if(count==null) {count=0;} + Integer count = labReportvsitemMapper.getLabReportCount(jyrq, yq, ybh); + if (count == null) { + count = 0; + } reportParam.setResultRows(count); - String filename=labReportvsitemMapper.getreportCode(comReportInstr.getReportBgdh()); - return printToPdf(filename, reportParam, UUID.randomUUID().toString(), true); - + String filename = labReportvsitemMapper.getreportCode(comReportInstr.getReportBgdh()); + Result ref=printToPdf(filename, reportParam,"", base64); + String size=comReportInstr.getReportSize(); + if(ref!=null&&"0".equals(ref.getCode())) { + if ("1".equals(size)) { + ref.setMsg("A5"); + } + { + ref.setMsg("A4"); + } + } + return ref; } /** * 获取报告单模板 + * * @param jyrq 检验日期 - * @param yq 仪器 + * @param yq 仪器 * @param ybh 样本号 * @return 报告单模板 */ public ComReportInstr getReportTemplate(Date jyrq, String yq, String ybh) { - ComReportInstr comReportInstr0=new ComReportInstr(); - String yqdl=commonUtil.getYqdl(yq); - List info=labReportvsitemMapper.getComReportInstrByInstr(yq); - if("细菌仪".equals(yqdl)) { + ComReportInstr comReportInstr0 = new ComReportInstr(); + String yqdl = commonUtil.getYqdl(yq); + List info = labReportvsitemMapper.getComReportInstrByInstr(yq); + if ("细菌仪".equals(yqdl)) { String tyep; int med = commonUtil.getLabResultMedCountAll(jyrq, yq, ybh); - if (med > 1)tyep="2"; + if (med > 1) tyep = "2"; else { tyep = "1"; } List info0 = info.stream().filter(ss -> tyep.equals(ss.getReportType())).collect(Collectors.toList()); - if(info0.isEmpty()||info0==null)return comReportInstr0; + if (info0.isEmpty() || info0 == null) return comReportInstr0; return info0.get(0); } - Integer rows=labReportvsitemMapper.getLabReportCount(jyrq,yq,ybh); - if(rows==null) {rows=0;} + Integer rows = labReportvsitemMapper.getLabReportCount(jyrq, yq, ybh); + if (rows == null) { + rows = 0; + } for (ComReportInstr comReportInstr : info) { - Integer minrows=comReportInstr.getReportMinrows(); - Integer maxrows=comReportInstr.getReportMaxrows(); - if(minrows!=null&&minrows>0){ - if(rows 0) { + if (rows < minrows) { + continue; + } } - if(maxrows!=null&&maxrows>0){ - if(rows>maxrows){continue;} + if (maxrows != null && maxrows > 0) { + if (rows > maxrows) { + continue; + } } - String items=comReportInstr.getReportItems(); - if(items!=null&&!"".equals(items)) { + String items = comReportInstr.getReportItems(); + if (items != null && !"".equals(items)) { List itemList = Arrays.asList(items.split(",")); - int xms=labReportvsitemMapper.getLabReportCountwithitem(jyrq, yq, ybh, itemList); - if(xms>0){ + int xms = labReportvsitemMapper.getLabReportCountwithitem(jyrq, yq, ybh, itemList); + if (xms > 0) { return comReportInstr; } } - comReportInstr0=comReportInstr; + comReportInstr0 = comReportInstr; } return comReportInstr0; } + public String[] getReportpic(Date jyrq, String yq, String ybh) { List labGraphList = commonUtil.getLabGraphAll(jyrq, yq, ybh); String filepath = "graphs"; @@ -446,28 +467,29 @@ public class ReportUtil { /** * 获取电子签名 + * * @param yhdh 用户代号 * @return 签名地址 */ public String getSignName(String yhdh) { - if(yhdh==null|| yhdh.isEmpty())return ""; + if (yhdh == null || yhdh.isEmpty()) return ""; //SELECT zplx INTO :ls_pictype FROM off_staff WHERE rydh = :as_userno ; - String pictype="jpg";//暂时写死是jpg,8.0新版本后期可以考虑用户表增加字段指定类型 - String dirpath="signname"; + String pictype = "jpg";//暂时写死是jpg,8.0新版本后期可以考虑用户表增加字段指定类型 + String dirpath = "signname"; String httpPath = getHttpURL(dirpath); - String txlbmc = yhdh+ "." + pictype.toLowerCase(); - String filepath =ImageUtils.getStaticPath()+ File.separator +dirpath+ File.separator +txlbmc; + String txlbmc = yhdh + "." + pictype.toLowerCase(); + String filepath = ImageUtils.getStaticPath() + File.separator + dirpath + File.separator + txlbmc; //如果文件不存在则写入 - if(!ImageUtils.isFileExists(filepath)){ - byte[] txnr= commonUtil.getComUsrdzqm(yhdh); - if(txnr==null)return ""; + if (!ImageUtils.isFileExists(filepath)) { + byte[] txnr = commonUtil.getComUsrdzqm(yhdh); + if (txnr == null) return ""; try { ImageUtils.generateToStaticDir(txnr, dirpath, txlbmc); } catch (IOException e) { throw new RuntimeException(e); } } - return httpPath+"/"+txlbmc; + return httpPath + "/" + txlbmc; } public static String convertA5ToA4Blank(String a5PdfBase64) throws IOException { @@ -526,4 +548,85 @@ public class ReportUtil { return org.apache.commons.codec.binary.Base64.encodeBase64String(a4PdfBytes); } + /**批量打印报告单 + * + * @param bgmap 报告单主键,jyrq,yq,ybh + * @return + */ + public Result printReport(List bgmap) { + String staticpath = ImageUtils.getStaticPath() + File.separator+"printPDF"+ File.separator; + // List> bgdhBase64List = new ArrayList<>(); + List mergeBgdhList = new ArrayList<>(); + String brdh = ""; + int j = 0; + int fall=0,succ=0; + for (BatchPrintDTO bg : bgmap) { + String yq = bg.getYq(); + String ybh = bg.getYbh(); + Date jyrq=bg.getJyrq(); + LabPat labPatOne =commonUtil.getLabPatOne(jyrq, yq, ybh); + Result res= printReport(labPatOne,true); + if(res==null){ + fall++; + bg.setFlag("-1"); + bg.setMsg("打印失败"); + continue; + } + if(!"0".equals(res.getCode())){ + fall++; + bg.setFlag("-1"); + bg.setMsg(res.getMsg()); + continue; + } + bg.setFlag("1"); + bg.setMsg("打印成功"); + String pageType=res.getMsg(); +// Map map = new HashMap<>(); +// map.put("data", res.getData()); +// map.put("pageType", pageType); +// map.put("brdh",labPatOne.getBrdh()); +// map.put("confirmdt",labPatOne.getConfirmdt()); +// map.put("jyrq", jyrq); +// map.put("yq", yq); +// map.put("ybh", ybh); +// bgdhBase64List.add(map); + mergeBgdhList.add(getStringValue(res.getData())); + j++; + } + + + + String encode = ""; + try { + //合并成一个pdf交给前端 + String pdfName = UUID.randomUUID().toString(); + String path = staticpath+pdfName+".pdf"; + LisUtil.mergeToFile(mergeBgdhList,path); + //String httpPath = reportUtil.getPrintURL(pdfName); + //转成base64字符串 + File file = new File(path); + encode = Base64.encode(file); + //删除pdf文件 + FileUtils.deleteFile(path); + } catch (Exception e) { + e.printStackTrace(); + log.error("合并pdf报告失败：{}",e); + return new Result("-1",e.getMessage()); + } + //修改打印标志 + for (BatchPrintDTO list : bgmap) { + String flag=list.getFlag(); + if(flag!=null&&"1".equals(flag)) { + String yq = list.getYq(); + String ybh = list.getYbh(); + Date jyrq = list.getJyrq(); + commonUtil.updateLabPatByColumn(jyrq, yq, ybh, "dybz", "1"); + } + } + + return new Result("0","打印成功！",encode); + } + private String getStringValue(Object obj) { + return obj == null ? null : obj.toString(); + } } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/websocket/RetryMsgService.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/websocket/RetryMsgService.java index 3daf1ec..8302508 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/websocket/RetryMsgService.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/websocket/RetryMsgService.java @@ -2,6 +2,7 @@ package com.czlis.interfaceCommon.websocket; import com.alibaba.fastjson2.JSON; import com.czlis.common.core.redis.RedisCache; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,6 +11,7 @@ import java.util.concurrent.TimeUnit; /** * 消息重试服务（若依框架适配） */ +@Slf4j @Service public class RetryMsgService { @@ -79,7 +81,8 @@ public class RetryMsgService { redisCache.redisTemplate.delete(RETRY_COUNT_KEY_PREFIX + msgId); System.out.println("消息[" + msgId + "]重试第" + (retryCount + 1) + "次成功"); } catch (Exception e) { - e.printStackTrace(); + // e.printStackTrace(); + log.error("调用WebSocketMessage出错：",e); WebSocketMessage wsMessage = JSON.parseObject(msgJson, WebSocketMessage.class); String msgId = generateMsgId(wsMessage); diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java index ecf2035..e992591 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java @@ -5,12 +5,11 @@ import com.czlis.common.annotation.Anonymous; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.ComDict; +import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; import com.czlis.common.utils.poi.ExcelUtil; import com.czlis.interfaceCommon.constants.SysLogConstants; -import com.czlis.interfaceCommon.websocket.WebSocketInstrComm; import com.czlis.liswork.service.ComDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java index e440fb2..12a8db9 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java @@ -3,8 +3,8 @@ package com.czlis.liswork.controller.dict; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmBase; +import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmBaseService; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java index a29225d..a51e247 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java @@ -3,7 +3,6 @@ package com.czlis.liswork.controller.dict; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmFeeInstr; import com.czlis.common.enums.BusinessType; import com.czlis.interfaceCommon.constants.SysLogConstants; @@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotBlank; -import java.util.List; /** * 仪器收费项目对照 diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java index 9d7f7a2..09a6c4b 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java @@ -3,8 +3,8 @@ package com.czlis.liswork.controller.dict; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmReqitemVsReportitem; +import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmReqitemVsReportitemService; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java index e5c756d..a86bef7 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcBatchnoController.java @@ -4,7 +4,6 @@ import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.QcBatchno; import com.czlis.common.core.domain.entity.lis.QcSample; -import com.czlis.common.core.page.TableDataInfo; import com.czlis.liswork.pojo.DTO.QcCopySampleDTO; import com.czlis.liswork.service.QcBatchnoService; import io.swagger.annotations.Api; @@ -13,7 +12,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; /** diff --git a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcStatController.java b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcStatController.java index da91cb9..332acb6 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcStatController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcStatController.java @@ -5,7 +5,6 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.QcSample; import com.czlis.common.core.domain.entity.lis.QcVal; import com.czlis.liswork.service.QcStatService; -import com.czlis.liswork.service.QcValService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcValController.java b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcValController.java index d9eb154..8a555fd 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcValController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcValController.java @@ -2,10 +2,7 @@ package com.czlis.liswork.controller.qc; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.QcBatchno; -import com.czlis.common.core.domain.entity.lis.QcSample; import com.czlis.common.core.domain.entity.lis.QcVal; -import com.czlis.liswork.service.QcBatchnoService; import com.czlis.liswork.service.QcValService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/stats/NcisController.java b/liswork/src/main/java/com/czlis/liswork/controller/stats/NcisController.java index 487ca32..99b4012 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/stats/NcisController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/stats/NcisController.java @@ -7,7 +7,9 @@ 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.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController diff --git a/liswork/src/main/java/com/czlis/liswork/controller/stats/StatsController.java b/liswork/src/main/java/com/czlis/liswork/controller/stats/StatsController.java index c3e5f78..18f7079 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/stats/StatsController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/stats/StatsController.java @@ -2,7 +2,6 @@ package com.czlis.liswork.controller.stats; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.ComStatsParameter; import com.czlis.liswork.service.StatsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -10,7 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; import java.util.Map; @RestController diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/BatchAdjustController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/BatchAdjustController.java index 584a326..bdcbc60 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/BatchAdjustController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/BatchAdjustController.java @@ -9,7 +9,10 @@ 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.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/BatchPrintController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/BatchPrintController.java index d2487a8..64dc569 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/BatchPrintController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/BatchPrintController.java @@ -2,7 +2,6 @@ package com.czlis.liswork.controller.work; import com.czlis.common.core.domain.Result; import com.czlis.liswork.pojo.VO.BatchPrintQueryVO; -import com.czlis.liswork.pojo.VO.BatchPrintVO; import com.czlis.liswork.service.BatchPrintService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * 批量打印 */ @@ -29,8 +26,8 @@ public class BatchPrintController { @ApiOperation("打印数据") @PostMapping("/printAll") - public Result printAll(@RequestBody List batchPrintVOList){ - return batchPrintService.printAll(batchPrintVOList); + public Result printAll(@RequestBody BatchPrintQueryVO batchPrintQueryVO){ + return batchPrintService.printAll(batchPrintQueryVO); } @ApiOperation("查询需要打印的数据") diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index e8f9fc7..2c646a3 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -5,7 +5,6 @@ import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.ResultT; import com.czlis.common.core.domain.entity.lis.LabPat; -import com.czlis.common.core.domain.entity.lis.LabReqmain; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.domain.entity.lis.view.LabReqmainVO; import com.czlis.common.core.page.TableDataInfo; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java index 9a8d1ad..54c74fe 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java @@ -7,7 +7,6 @@ import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.text.Convert; import com.czlis.common.enums.BusinessType; -import com.czlis.common.utils.JsonParamUtils; import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.mapper.LisWorkGermMapper; import com.czlis.liswork.mapper.xtwh.XmMedMapper; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java index d20f586..5a3105d 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java @@ -8,7 +8,6 @@ import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.enums.BusinessType; import com.czlis.interfaceCommon.constants.SysLogConstants; -import com.czlis.liswork.mapper.LisWorkPageInfoMapper; import com.czlis.liswork.service.LisWorkOperService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 8f9b529..4bfc9c3 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -1,6 +1,5 @@ package com.czlis.liswork.controller.work; -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.domain.entity.lis.LabResultRe; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/WholeProcessController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/WholeProcessController.java index 10ccbdd..f2dcb47 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/WholeProcessController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/WholeProcessController.java @@ -1,8 +1,6 @@ package com.czlis.liswork.controller.work; import com.czlis.common.core.controller.BaseController; -import com.czlis.common.core.domain.ResultT; -import com.czlis.common.core.domain.entity.lis.view.LabReqmainVO; import com.czlis.common.core.page.TableDataInfo; import com.czlis.liswork.pojo.WholeProcessVO; import com.czlis.liswork.service.WholeProcessService; @@ -11,7 +9,6 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java index 7dee746..a9dbc84 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComConfigDictController.java @@ -3,10 +3,10 @@ package com.czlis.liswork.controller.xtwh; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.AjaxResult; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; import com.czlis.common.utils.poi.ExcelUtil; -import com.czlis.common.core.domain.entity.lis.ComConfigDict; import com.czlis.liswork.service.ComConfigDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java index 80aefca..a1ce6d2 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java @@ -1,18 +1,10 @@ package com.czlis.liswork.controller.xtwh; -import com.czlis.common.annotation.Anonymous; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; -import com.czlis.common.core.domain.AjaxResult; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.ComConfigDict; -import com.czlis.common.core.domain.entity.lis.ComOpt; -import com.czlis.common.core.domain.entity.lis.ComOptTemplate; -import com.czlis.common.core.domain.entity.lis.LabPat; -import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; -import com.czlis.interfaceCommon.constants.SysLogConstants; -import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.liswork.service.ComOptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import java.util.List; @Api(tags = "后台参数界面") diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportDictController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportDictController.java index 1ff63fb..fc77e85 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportDictController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportDictController.java @@ -3,8 +3,6 @@ package com.czlis.liswork.controller.xtwh; import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.AjaxResult; -import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.ComDict; import com.czlis.common.core.domain.entity.lis.ComReportDict; import com.czlis.common.enums.BusinessType; import com.czlis.common.utils.poi.ExcelUtil; @@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; import java.util.List; @Api(tags = "参数模板设置") diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportInstrController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportInstrController.java index b3b9784..3417752 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportInstrController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComReportInstrController.java @@ -6,7 +6,6 @@ import com.czlis.common.core.domain.AjaxResult; import com.czlis.common.core.domain.entity.lis.ComReportInstr; import com.czlis.common.enums.BusinessType; import com.czlis.common.utils.poi.ExcelUtil; -import com.czlis.interfaceCommon.utils.LisfileUtil; import com.czlis.liswork.service.ComReportInstrService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,7 +13,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java index 54811b6..f38f5ec 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java @@ -1,7 +1,10 @@ package com.czlis.liswork.mapper; -import com.czlis.common.core.domain.entity.*; -import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.common.core.domain.entity.SysUser; +import com.czlis.common.core.domain.entity.lis.LabPat; +import com.czlis.common.core.domain.entity.lis.LabPatBk; +import com.czlis.common.core.domain.entity.lis.LabResultBk; +import com.czlis.common.core.domain.entity.lis.XmInter; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java index ef0d16d..55e2216 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java @@ -3,6 +3,7 @@ package com.czlis.liswork.mapper; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.interfaceCommon.pojo.entity.ResultCalcDTO; import org.apache.ibatis.annotations.Param; + import java.util.Date; import java.util.List; import java.util.Map; diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java index f4e0ca1..44fa07a 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java @@ -4,9 +4,7 @@ import com.czlis.common.core.domain.entity.lis.QcSample; import com.czlis.liswork.pojo.DTO.QcGraphParamDTO; import com.czlis.liswork.pojo.DTO.QcMonthstDTO; import com.czlis.liswork.pojo.DTO.QcValDTO; -import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; public interface QcGraphMapper { diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/QcRulesMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/QcRulesMapper.java index a6d9b75..04b7e5a 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/QcRulesMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/QcRulesMapper.java @@ -1,6 +1,5 @@ package com.czlis.liswork.mapper; -import com.czlis.common.core.domain.entity.lis.QcFrmsmpl; import com.czlis.common.core.domain.entity.lis.QcRules; import com.czlis.common.core.domain.entity.lis.QcSample; diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmFeeInstrItemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmFeeInstrItemMapper.java index e78af93..0dc48e0 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmFeeInstrItemMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmFeeInstrItemMapper.java @@ -1,12 +1,9 @@ package com.czlis.liswork.mapper.dict; -import com.czlis.common.core.domain.entity.lis.XmFeeInstr; import com.czlis.liswork.pojo.DTO.QueryXmDTO; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -import java.util.Objects; public interface XmFeeInstrItemMapper { List> queryXm(QueryXmDTO queryXmDTO); diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java index 9cdc044..74d72b3 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java @@ -5,7 +5,6 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; -import java.util.Objects; public interface XmReqitemVsReportitemMapper { List query(XmReqitemVsReportitem xmReqitemVsReportitem); diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchCheckMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchCheckMapper.java index 5d16c35..0640774 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchCheckMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchCheckMapper.java @@ -1,6 +1,5 @@ package com.czlis.liswork.mapper.work; -import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.liswork.pojo.DTO.BatchCheckDTO; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchPrintMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchPrintMapper.java index 719bc8b..64b7525 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchPrintMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/work/BatchPrintMapper.java @@ -1,10 +1,10 @@ package com.czlis.liswork.mapper.work; import com.czlis.liswork.pojo.VO.BatchPrintQueryVO; +import com.czlis.liswork.pojo.VO.BatchPrintVO; import java.util.List; -import java.util.Map; public interface BatchPrintMapper { - List> queryList(BatchPrintQueryVO batchPrintQueryVO); + List queryList(BatchPrintQueryVO batchPrintQueryVO); } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java index 24e2046..1be2790 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java @@ -1,7 +1,7 @@ package com.czlis.liswork.mapper.work; -import java.util.Map; import java.util.List; +import java.util.Map; public interface RcvBarcodeRefusedMapper { List> refreshData(String sqh); diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComReportInstrMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComReportInstrMapper.java index 901143a..7010948 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComReportInstrMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComReportInstrMapper.java @@ -1,7 +1,6 @@ package com.czlis.liswork.mapper.xtwh; import com.czlis.common.core.domain.entity.lis.ComReportInstr; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java index f04e813..ecbd0f0 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java @@ -1,7 +1,6 @@ package com.czlis.liswork.mapper.xtwh; import com.czlis.common.core.domain.entity.lis.LabInstr; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/BatchCheckDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/BatchCheckDTO.java index 609e5b5..026d15c 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/BatchCheckDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/BatchCheckDTO.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; import java.util.Date; @Data diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/MediumDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/MediumDTO.java index e5e0a86..0524687 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/MediumDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/MediumDTO.java @@ -1,7 +1,5 @@ package com.czlis.liswork.pojo.DTO; -import com.czlis.common.core.domain.entity.lis.LabGermsheetNew; -import com.czlis.common.core.domain.entity.lis.BactMedium; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcMonthstDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcMonthstDTO.java index 158f1d8..c996231 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcMonthstDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcMonthstDTO.java @@ -1,6 +1,5 @@ package com.czlis.liswork.pojo.DTO; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/ReqlistDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/ReqlistDTO.java index cc7136b..9868c76 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/ReqlistDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/ReqlistDTO.java @@ -1,7 +1,5 @@ package com.czlis.liswork.pojo.DTO; -import com.czlis.common.core.domain.entity.lis.LabInputmdl; -import com.czlis.common.core.domain.entity.lis.LabInputmdlDetail; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintQueryVO.java b/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintQueryVO.java index 04c1b97..e52c294 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintQueryVO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintQueryVO.java @@ -1,5 +1,7 @@ package com.czlis.liswork.pojo.VO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -10,24 +12,42 @@ import java.util.Date; @Data @NoArgsConstructor @AllArgsConstructor +@ApiModel(value = "BatchPrintQueryVO", description = "批量查询入参") public class BatchPrintQueryVO { + @ApiModelProperty(value = "检验日期") private Date jyrq; @NotBlank(message = "样本号不能为空") + @ApiModelProperty(value = "样本号范围") private String ybh; + @ApiModelProperty(value = "病人类型") private String brly; + @ApiModelProperty(value = "科室") private String ksdh; + @ApiModelProperty(value = "仪器") private String yq; + @ApiModelProperty(value = "排除选择的科室") private String notksdh; + @ApiModelProperty(value = "排除选择的病人类型") private String notbrly; + @ApiModelProperty(value = "分组打印报告") private String fzdy; + @ApiModelProperty(value = "打印未打印报告") private String dybz; + @ApiModelProperty(value = "打印未审核报告") private String jgbz; + @ApiModelProperty(value = "打印排序类型") private String sorttype; + @ApiModelProperty(value = "无病人姓名不打印") private String nobrxm; + @ApiModelProperty(value = "无检验结果不打印") private String nocsjg; + @ApiModelProperty(value = "打印已审核报告") private String jgbz2; + @ApiModelProperty(value = "仪器组别") private String yqz; + @ApiModelProperty(value = "仅打印阳性报告") private String dyyx; + @ApiModelProperty(value = "排除阳性报告") private String pcyx; } diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintVO.java b/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintVO.java index 62e1895..4dba650 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintVO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/VO/BatchPrintVO.java @@ -1,5 +1,8 @@ package com.czlis.liswork.pojo.VO; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,9 +12,28 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor +@ApiModel(value = "BatchPrintVO", description = "查询返回") public class BatchPrintVO { + @ApiModelProperty(value = "检验日期") private Date jyrq; + @ApiModelProperty(value = "仪器") private String yq; + @ApiModelProperty(value = "样本号") private String ybh; - + @ApiModelProperty(value = "病人姓名") + private String brxm; + @ApiModelProperty(value = "科室") + private String ksdh; + @ApiModelProperty(value = "床号") + private String ch; + @ApiModelProperty(value = "病人类型") + private String brly; + @ApiModelProperty(value = "数量") + private Integer cp_cnt; + @ApiModelProperty(value = "消息") + private String cp_msg; + @ApiModelProperty(value = "阳性数量") + private Integer ycjg; + @ApiModelProperty(value = "排序样本号") + private String cp_ybh; } diff --git a/liswork/src/main/java/com/czlis/liswork/service/BatchPrintService.java b/liswork/src/main/java/com/czlis/liswork/service/BatchPrintService.java index bf61056..7277fc6 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/BatchPrintService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/BatchPrintService.java @@ -2,12 +2,9 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; import com.czlis.liswork.pojo.VO.BatchPrintQueryVO; -import com.czlis.liswork.pojo.VO.BatchPrintVO; - -import java.util.List; public interface BatchPrintService { - Result printAll(List batchPrintVOList); + Result printAll(BatchPrintQueryVO batchPrintVOList); Result queryList(BatchPrintQueryVO batchPrintQueryVO); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java b/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java index b66d282..32a5992 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ComConfigDictService.java @@ -1,9 +1,6 @@ package com.czlis.liswork.service; -import com.czlis.common.constant.UserConstants; import com.czlis.common.core.domain.entity.lis.ComConfigDict; -import com.czlis.common.exception.ServiceException; -import com.czlis.common.utils.StringUtils; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java b/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java index 9985244..0edf286 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ComLocalconfigService.java @@ -1,10 +1,8 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.entity.lis.ComConfigDict; -import com.czlis.common.core.domain.entity.lis.ComLocalconfig; import java.util.List; -import java.util.Map; public interface ComLocalconfigService { List getComLocalconfigList(); diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComOptService.java b/liswork/src/main/java/com/czlis/liswork/service/ComOptService.java index 3b14aff..92b65b0 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ComOptService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ComOptService.java @@ -2,8 +2,6 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.ComConfigDict; -import com.czlis.common.core.domain.entity.lis.ComOpt; -import com.czlis.common.core.domain.entity.lis.ComOptTemplate; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComReportInstrService.java b/liswork/src/main/java/com/czlis/liswork/service/ComReportInstrService.java index dfce398..44fbe2d 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ComReportInstrService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ComReportInstrService.java @@ -1,8 +1,6 @@ package com.czlis.liswork.service; -import com.czlis.common.core.domain.AjaxResult; import com.czlis.common.core.domain.entity.lis.ComReportInstr; -import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java index 6c8d9d9..1e644d0 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java @@ -2,8 +2,6 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabPat; -import com.czlis.common.core.domain.entity.lis.LabResult; - import java.util.Date; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java b/liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java index d296b85..54ca0d6 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/QcBatchnoService.java @@ -5,7 +5,6 @@ import com.czlis.common.core.domain.entity.lis.QcBatchno; import com.czlis.common.core.domain.entity.lis.QcSample; import com.czlis.liswork.pojo.DTO.QcCopySampleDTO; -import java.util.Date; import java.util.List; public interface QcBatchnoService { diff --git a/liswork/src/main/java/com/czlis/liswork/service/QcStatService.java b/liswork/src/main/java/com/czlis/liswork/service/QcStatService.java index 96cc4da..c5bd3de 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/QcStatService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/QcStatService.java @@ -5,8 +5,6 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.QcSample; import com.czlis.common.core.domain.entity.lis.QcVal; -import java.util.Date; - public interface QcStatService { Result queryMonthst(QcVal qcVal); Result queryMonthskzj(QcSample qcSample); diff --git a/liswork/src/main/java/com/czlis/liswork/service/QualitySetService.java b/liswork/src/main/java/com/czlis/liswork/service/QualitySetService.java index 6199e48..ffd4c74 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/QualitySetService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/QualitySetService.java @@ -1,7 +1,8 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.common.core.domain.entity.lis.QcFrmsmpl; +import com.czlis.common.core.domain.entity.lis.QcRules; import com.czlis.liswork.pojo.DTO.QcRulesDTO; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java index 31450dc..2f3eec4 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java @@ -3,7 +3,6 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.*; import com.czlis.liswork.pojo.DTO.XmInfoNewDTO; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/StatsService.java b/liswork/src/main/java/com/czlis/liswork/service/StatsService.java index 507b9de..f2901e1 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/StatsService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/StatsService.java @@ -1,9 +1,7 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.ComStatsParameter; -import java.util.List; import java.util.Map; public interface StatsService { diff --git a/liswork/src/main/java/com/czlis/liswork/service/WholeProcessService.java b/liswork/src/main/java/com/czlis/liswork/service/WholeProcessService.java index c4ed001..59d7ded 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/WholeProcessService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/WholeProcessService.java @@ -1,6 +1,5 @@ package com.czlis.liswork.service; -import com.czlis.common.core.domain.Result; import com.czlis.liswork.pojo.WholeProcessVO; import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/XmFeeInstrService.java b/liswork/src/main/java/com/czlis/liswork/service/XmFeeInstrService.java index 41548ff..ab2c1c0 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/XmFeeInstrService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/XmFeeInstrService.java @@ -4,8 +4,6 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmFeeInstr; import com.czlis.liswork.pojo.DTO.QueryXmDTO; -import java.util.List; - public interface XmFeeInstrService { Result query(XmFeeInstr xmFeeInstr); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java index c245d25..465c8eb 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java @@ -3,9 +3,9 @@ package com.czlis.liswork.service.impl; import cn.hutool.extra.pinyin.PinyinUtil; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.ComDict; import com.czlis.common.utils.StringUtils; import com.czlis.interfaceCommon.mapper.ComDictMapper; -import com.czlis.common.core.domain.entity.lis.ComDict; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.liswork.service.ComDictService; import lombok.extern.slf4j.Slf4j; @@ -14,7 +14,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - import java.util.List; /** diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java index cdb1266..2a2d9e1 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java @@ -1,13 +1,12 @@ package com.czlis.liswork.service.impl; import com.czlis.common.core.domain.Result; -import com.czlis.liswork.mapper.xtwh.InstrMapper; import com.czlis.common.core.domain.entity.lis.LabInstr; +import com.czlis.liswork.mapper.xtwh.InstrMapper; import com.czlis.liswork.service.InstrService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; - import java.util.List; @Service diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java index 9dc24dd..fd6bd68 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkGermServiceImpl.java @@ -5,18 +5,13 @@ import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.utils.SecurityUtils; import com.czlis.common.utils.ServletUtils; import com.czlis.interfaceCommon.constants.*; -import com.czlis.interfaceCommon.mapper.ComDictMapper; -import com.czlis.interfaceCommon.mapper.LabResultMedMapper; import com.czlis.interfaceCommon.pojo.inter.SetReport; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisInterfaceUtil; import com.czlis.interfaceCommon.utils.LisUtil; import com.czlis.interfaceCommon.utils.LisWorkUtils; import com.czlis.liswork.mapper.LisWorkGermMapper; -import com.czlis.liswork.mapper.LisWorkMapper; -import com.czlis.liswork.mapper.xtwh.XmMedgroupMapper; import com.czlis.liswork.pojo.DTO.MediumDTO; -import com.czlis.liswork.pojo.HistoryResult; import com.czlis.liswork.service.LisWorkGermService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateFormatUtils; @@ -24,7 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 648442a..7a73b58 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -1,21 +1,24 @@ package com.czlis.liswork.service.impl; -import com.czlis.common.core.domain.entity.lis.*; -import com.czlis.common.utils.*; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.common.utils.JsonParamUtils; +import com.czlis.common.utils.SecurityUtils; +import com.czlis.common.utils.ServletUtils; +import com.czlis.common.utils.StringUtils; import com.czlis.interfaceCommon.constants.LabPatConstants; -import com.czlis.interfaceCommon.utils.*; +import com.czlis.interfaceCommon.utils.CommonUtil; +import com.czlis.interfaceCommon.utils.LisWorkUtils; import com.czlis.liswork.mapper.LisWorkPageInfoMapper; import com.czlis.liswork.service.LisWorkOperService; - -import com.sun.org.apache.bcel.internal.generic.RETURN; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; @Service diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java index ebd5ad7..d2696f2 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java @@ -7,13 +7,12 @@ import cn.hutool.core.date.DateUtil; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.*; import com.czlis.interfaceCommon.pojo.entity.LastLabPatParam; +import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisWorkUtils; -import com.czlis.interfaceCommon.utils.ReportUtil; import com.czlis.liswork.mapper.LisWorkPageInfoMapper; import com.czlis.liswork.pojo.DTO.HistoryResultDTO; import com.czlis.liswork.pojo.HistoryResult; import com.czlis.liswork.service.LisWorkPageInfoService; -import com.czlis.interfaceCommon.utils.CommonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index a5f4b4b..d9bfd03 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -1,8 +1,8 @@ package com.czlis.liswork.service.impl; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.ResultT; -import com.czlis.common.core.domain.entity.*; +import com.czlis.common.core.domain.entity.SysLoginParam; +import com.czlis.common.core.domain.entity.SysUser; import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.core.domain.entity.lis.view.LabReqmainVO; import com.czlis.common.enums.UserStatus; @@ -20,8 +20,6 @@ import com.czlis.interfaceCommon.pojo.inter.GetReqInterface; import com.czlis.interfaceCommon.pojo.inter.SetReqStatus; import com.czlis.interfaceCommon.utils.*; import com.czlis.liswork.mapper.LisWorkMapper; - - import com.czlis.liswork.service.LisWorkService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java index 2c515fa..bc98914 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java @@ -11,8 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; @Service diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmBaseServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmBaseServiceImpl.java index c05fab5..6fb7e31 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/XmBaseServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmBaseServiceImpl.java @@ -1,15 +1,14 @@ package com.czlis.liswork.service.impl; import com.czlis.common.core.domain.Result; -import com.czlis.liswork.mapper.dict.XmBaseMapper; import com.czlis.common.core.domain.entity.lis.XmBase; +import com.czlis.liswork.mapper.dict.XmBaseMapper; import com.czlis.liswork.service.XmBaseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.util.List; @Service diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmFeeInstrServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmFeeInstrServiceImpl.java index ef83445..73fb918 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/XmFeeInstrServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmFeeInstrServiceImpl.java @@ -1,16 +1,15 @@ package com.czlis.liswork.service.impl; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmFeeInstr; import com.czlis.interfaceCommon.mapper.XmFeeInstrMapper; import com.czlis.liswork.mapper.dict.XmFeeInstrItemMapper; -import com.czlis.common.core.domain.entity.lis.XmFeeInstr; import com.czlis.liswork.pojo.DTO.QueryXmDTO; import com.czlis.liswork.service.XmFeeInstrService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmMedinterServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmMedinterServiceImpl.java index 1bf2476..ef330c4 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/XmMedinterServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmMedinterServiceImpl.java @@ -1,13 +1,12 @@ package com.czlis.liswork.service.impl; +import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMedinter; import com.czlis.liswork.mapper.xtwh.XmMedinterMapper; import com.czlis.liswork.service.XmMedinterService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.czlis.common.core.domain.Result; - import java.util.List; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java index 7a9dcd5..d8da8a3 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java @@ -1,8 +1,8 @@ package com.czlis.liswork.service.impl; import com.czlis.common.core.domain.Result; -import com.czlis.liswork.mapper.dict.XmReqitemVsReportitemMapper; import com.czlis.common.core.domain.entity.lis.XmReqitemVsReportitem; +import com.czlis.liswork.mapper.dict.XmReqitemVsReportitemMapper; import com.czlis.liswork.service.XmReqitemVsReportitemService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.stream.Collectors; @Service diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java index 88ac497..0cd85d4 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java @@ -6,7 +6,6 @@ import com.czlis.common.core.domain.entity.lis.QcVal; import com.czlis.common.utils.DateUtils; import com.czlis.common.utils.SecurityUtils; import com.czlis.interfaceCommon.utils.LisUtil; -import com.czlis.liswork.mapper.QcBatchnoMapper; import com.czlis.liswork.mapper.QcValMapper; import com.czlis.liswork.service.QcValService; import lombok.extern.slf4j.Slf4j; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java index 5652ece..5b02550 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QualitySetServiceImpl.java @@ -1,7 +1,10 @@ package com.czlis.liswork.service.impl.qc; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.common.core.domain.entity.lis.QcFrmsmpl; +import com.czlis.common.core.domain.entity.lis.QcRules; +import com.czlis.common.core.domain.entity.lis.XmInfoNew; +import com.czlis.common.core.domain.entity.lis.XmInfoVs; import com.czlis.liswork.mapper.QcFrmsmplMapper; import com.czlis.liswork.mapper.QcRulesMapper; import com.czlis.liswork.mapper.QcSampleMapper; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/NcisServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/NcisServiceImpl.java index 374f9d4..ba412a4 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/NcisServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/NcisServiceImpl.java @@ -2,22 +2,17 @@ package com.czlis.liswork.service.impl.stats; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.ComStatsParameter; -import com.czlis.common.core.domain.entity.lis.ComStatsTemplate; -import com.czlis.common.utils.StringUtils; import com.czlis.interfaceCommon.utils.CalcUtils; -import com.czlis.interfaceCommon.utils.LisUtil; -import com.czlis.interfaceCommon.utils.LisWorkUtils; import com.czlis.liswork.mapper.stats.StatsMapper; -import com.czlis.liswork.mapper.xtwh.ComStatsParameterMapper; -import com.czlis.liswork.mapper.xtwh.ComStatsTemplateMapper; import com.czlis.liswork.service.NcisService; -import com.czlis.liswork.service.StatsService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; -import java.util.stream.Collectors; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; @Service @Slf4j diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java index 23dc4c2..c68a1b8 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/stats/StatsServiceImpl.java @@ -12,7 +12,6 @@ import com.czlis.liswork.mapper.xtwh.ComStatsParameterMapper; import com.czlis.liswork.mapper.xtwh.ComStatsTemplateMapper; import com.czlis.liswork.service.StatsService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchCheckServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchCheckServiceImpl.java index bc27a54..d380b73 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchCheckServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchCheckServiceImpl.java @@ -3,7 +3,9 @@ package com.czlis.liswork.service.impl.work; import cn.hutool.core.date.DateUtil; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.common.core.domain.entity.lis.LabPat; +import com.czlis.common.core.domain.entity.lis.LabResult; +import com.czlis.common.core.domain.entity.lis.LabResultMed; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisUtil; import com.czlis.interfaceCommon.utils.LisWorkUtils; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java index af6fde2..b066cc5 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchInServiceImpl.java @@ -5,10 +5,8 @@ import com.czlis.common.core.domain.entity.lis.LabInputmdl; import com.czlis.common.core.domain.entity.lis.LabInputmdlDetail; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; -import com.czlis.common.utils.DateUtils; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisUtil; -import com.czlis.interfaceCommon.utils.LisWorkBase; import com.czlis.interfaceCommon.utils.LisWorkcom; import com.czlis.liswork.pojo.VO.BatchInVO; import com.czlis.liswork.service.BatchInService; @@ -21,7 +19,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Slf4j diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchPrintServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchPrintServiceImpl.java index 3c8e696..80bb875 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchPrintServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/work/BatchPrintServiceImpl.java @@ -1,9 +1,10 @@ package com.czlis.liswork.service.impl.work; -import cn.hutool.core.util.StrUtil; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.LabInstr; -import com.czlis.interfaceCommon.utils.CommonUtil; +import com.czlis.common.core.domain.ResultT; +import com.czlis.common.utils.bean.BeanUtils; +import com.czlis.interfaceCommon.pojo.dto.BatchPrintDTO; +import com.czlis.interfaceCommon.utils.ReportUtil; import com.czlis.liswork.mapper.work.BatchPrintMapper; import com.czlis.liswork.pojo.VO.BatchPrintQueryVO; import com.czlis.liswork.pojo.VO.BatchPrintVO; @@ -13,62 +14,64 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Service public class BatchPrintServiceImpl implements BatchPrintService { - @Autowired - CommonUtil commonUtil; @Autowired BatchPrintMapper batchPrintMapper; - - + @Autowired + ReportUtil reportUtil; @Override - public Result printAll(List batchPrintVOList) { + public Result printAll(BatchPrintQueryVO batchPrintQueryVO) { //TODO 直接过滤掉未审核的报告了，如果需要后面再加吧 + List batchPrintVOList=queryListdata(batchPrintQueryVO); if(batchPrintVOList.size() <= 0) return new Result("0","没有数据可打印！"); - LabInstr labInstr = commonUtil.getLabInstr(batchPrintVOList.get(0).getYq()); - if(labInstr.getPcdyms().equals("所有标本")){ - for (BatchPrintVO batchPrintVO : batchPrintVOList) { - + List list1 = batchPrintVOList.stream().map(item2 -> { + BatchPrintDTO item1 = new BatchPrintDTO(); + BeanUtils.copyProperties(item2, item1); + return item1; + }).collect(Collectors.toList()); + Result result =reportUtil.printReport(list1); + if(result==null&&!result.getCode().equals("0")) return null; + Map table1Map = list1.stream().collect(Collectors.toMap(BatchPrintDTO::getYbh, t -> t)); + +// 2. 遍历目标list2，匹配覆盖字段 + for (BatchPrintVO t2 : batchPrintVOList) { + BatchPrintDTO t1 = table1Map.get(t2.getYbh()); + if (t1 != null) { + // 两个字段覆盖 + t2.setCp_msg(t1.getMsg()); + t2.setCp_cnt(Integer.getInteger(t1.getFlag())); } } - - - return null; + Map map=new HashMap<>(); + map.put("base64data",result.getData()); + map.put("printflag",batchPrintVOList); + return new Result("0","打印成功！",map); } @Override public Result queryList(BatchPrintQueryVO batchPrintQueryVO) { - int perpage = 0; - + List mapList=queryListdata(batchPrintQueryVO); + if(mapList==null||mapList.size() <= 0) return new Result("-1","没有符合条件的数据！"); + return new ResultT<>("0","查询成功！",mapList); + } + private List queryListdata(BatchPrintQueryVO batchPrintQueryVO) { //校验参数 String ybh = batchPrintQueryVO.getYbh().trim(); - - - Result result = LisCommonUtil.changeYBHToSQL(ybh); - if(!result.getCode().equals("0")) return result; + if(!result.getCode().equals("0")) return null; ybh = result.getData().toString(); batchPrintQueryVO.setYbh(ybh); //TODO 调用查询sql - - - String yq = batchPrintQueryVO.getYq(); - String autofeedpaper = commonUtil.getComOptValue(yq, "AUTOFEEDPAPER"); - LabInstr labInstr = commonUtil.getLabInstr(yq); - if(labInstr != null){ - perpage = labInstr.getMyhs(); - }else{ - perpage = 15; - } - List> mapList = batchPrintMapper.queryList(batchPrintQueryVO); - if(mapList.size() <= 0) return new Result("-1","没有符合条件的数据！"); - - return new Result("0","查询成功！",mapList); + List mapList = batchPrintMapper.queryList(batchPrintQueryVO); + if(mapList.size() <= 0) return null; + return mapList; } } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java index b348ff2..e0c50d9 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComLocalconfigServiceImpl.java @@ -1,6 +1,5 @@ package com.czlis.liswork.service.impl.xtwh; -import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.utils.SecurityUtils; @@ -9,7 +8,6 @@ import com.czlis.liswork.mapper.xtwh.ComReportDictMapper; import com.czlis.liswork.mapper.xtwh.LocalconfigMapper; import com.czlis.liswork.service.ComConfigDictService; import com.czlis.liswork.service.ComLocalconfigService; -import com.itextpdf.commons.utils.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComOptServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComOptServiceImpl.java index ac6ec77..de5a30f 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComOptServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComOptServiceImpl.java @@ -1,10 +1,12 @@ package com.czlis.liswork.service.impl.xtwh; import com.czlis.common.core.domain.Result; -import com.czlis.common.core.domain.entity.lis.*; +import com.czlis.common.core.domain.entity.lis.ComConfigDict; +import com.czlis.common.core.domain.entity.lis.ComDict; +import com.czlis.common.core.domain.entity.lis.ComOpt; +import com.czlis.common.core.domain.entity.lis.LabInstr; import com.czlis.common.utils.ComOptionUtils; import com.czlis.common.utils.SecurityUtils; -import com.czlis.interfaceCommon.constants.ConfigTypeConstants; import com.czlis.interfaceCommon.mapper.ComOptMapper; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.liswork.service.ComConfigDictService; diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportDictServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportDictServiceImpl.java index 06e6c12..1ac92b4 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportDictServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportDictServiceImpl.java @@ -4,7 +4,6 @@ import com.czlis.common.constant.UserConstants; import com.czlis.common.core.domain.AjaxResult; import com.czlis.common.core.domain.entity.lis.ComReportDict; import com.czlis.common.core.domain.entity.lis.ComReportInstr; -import com.czlis.common.core.domain.entity.lis.LabReportinstr; import com.czlis.common.exception.ServiceException; import com.czlis.common.utils.SecurityUtils; import com.czlis.common.utils.StringUtils; @@ -12,7 +11,6 @@ import com.czlis.common.utils.file.FileUtils; import com.czlis.interfaceCommon.utils.LisfileUtil; import com.czlis.liswork.mapper.xtwh.ComReportDictMapper; import com.czlis.liswork.mapper.xtwh.ComReportInstrMapper; -import com.czlis.liswork.mapper.xtwh.LabReportinstrMapper; import com.czlis.liswork.service.ComReportDictService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -20,11 +18,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.*; +import java.util.List; /** * 配置参数报表模板,系统配置菜单依据本报表模板自动创建配置档 diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportInstrServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportInstrServiceImpl.java index 296ee95..64626ad 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportInstrServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComReportInstrServiceImpl.java @@ -1,24 +1,13 @@ package com.czlis.liswork.service.impl.xtwh; -import com.czlis.common.constant.UserConstants; -import com.czlis.common.core.domain.AjaxResult; import com.czlis.common.core.domain.entity.lis.ComReportInstr; -import com.czlis.common.core.domain.entity.lis.LabReportinstr; -import com.czlis.common.exception.ServiceException; -import com.czlis.common.utils.SecurityUtils; -import com.czlis.common.utils.StringUtils; -import com.czlis.common.utils.file.FileUtils; -import com.czlis.interfaceCommon.utils.LisfileUtil; import com.czlis.liswork.mapper.xtwh.ComReportInstrMapper; -import com.czlis.liswork.mapper.xtwh.LabReportinstrMapper; import com.czlis.liswork.service.ComReportInstrService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; import java.util.List; /** diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsTemplateServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsTemplateServiceImpl.java index 008b192..ce93f3f 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsTemplateServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsTemplateServiceImpl.java @@ -12,6 +12,7 @@ import com.czlis.liswork.service.ComStatsTemplateService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.List; @Service diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmCompServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmCompServiceImpl.java index 98f6c1e..e0a397b 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmCompServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmCompServiceImpl.java @@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; @Slf4j diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedmainServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedmainServiceImpl.java index b2d6284..94c1141 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedmainServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedmainServiceImpl.java @@ -9,7 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @Slf4j diff --git a/liswork/src/main/java/com/czlis/liswork/utils/LisCommonUtil.java b/liswork/src/main/java/com/czlis/liswork/utils/LisCommonUtil.java index 259637e..ab6a381 100644 --- a/liswork/src/main/java/com/czlis/liswork/utils/LisCommonUtil.java +++ b/liswork/src/main/java/com/czlis/liswork/utils/LisCommonUtil.java @@ -2,6 +2,7 @@ package com.czlis.liswork.utils; import cn.hutool.core.util.StrUtil; import com.czlis.common.core.domain.Result; +import com.czlis.interfaceCommon.utils.LisUtil; import java.util.ArrayList; import java.util.List; @@ -9,27 +10,9 @@ import java.util.List; public class LisCommonUtil { public static Result changeYBHToSQL(String ybh) { - //转换样本号 - ybh = ybh.replaceAll("，",","); - ybh = ybh.replaceAll("--","-"); - String[] strings = StrUtil.splitToArray(ybh, ","); - String ybhSQL = "",ybhSQL_ = ""; - for (String string : strings) { - if(string.contains("-")){ - String[] split = StrUtil.splitToArray(string, "-"); - if(split.length != 2) return new Result("-1","样本号输入非法！"); - int start = Integer.parseInt(split[0]); - int end = Integer.parseInt(split[1]); - if(start > end) return new Result("-1","样本号输入非法！"); - ybhSQL_ = ybhSQL_ + " or (ybh >= '"+ start + "' and ybh <='" + end + "') "; - }else{ - //全是,的 - ybhSQL = ybhSQL + "'" + string + "',"; - } - } - ybhSQL = "ybh in (" + ybhSQL + ")"; - ybh = "("+ybhSQL + ybhSQL_ + ")"; - return new Result("0","样本号转换成功！",ybh); + String ybhSQL= LisUtil.getYbhWhere("ybh",ybh); + if("".equals(ybhSQL))return new Result("-1","样本号输入非法！"); + return new Result("0","样本号转换成功！",ybhSQL); } public static Result changeYBHToList(String ybhStr){ @@ -56,4 +39,6 @@ public class LisCommonUtil { } return new Result("0","样本号转换成功！",ybhList); } + + } diff --git a/liswork/src/main/resources/mapper/work/BatchPrintMapper.xml b/liswork/src/main/resources/mapper/work/BatchPrintMapper.xml index 3b31df6..3a3a107 100644 --- a/liswork/src/main/resources/mapper/work/BatchPrintMapper.xml +++ b/liswork/src/main/resources/mapper/work/BatchPrintMapper.xml @@ -2,30 +2,34 @@ - SELECT DISTINCT lab_pat.brxm, lab_pat.ksdh, lab_pat.ch, lab_pat.brly, lab_pat.ybh, 0 as cp_cnt, - '1' as cp_msg, - (select count(*) from lab_result where lab_result.yq=lab_pat.yq and lab_result.jyrq=lab_pat.jyrq and lab_result.ybh=lab_pat.ybh and result_flag in('H','L','P')) as ycjg + '待打印' as cp_msg, + (select count(1) from lab_result where lab_result.yq=lab_pat.yq and lab_result.jyrq=lab_pat.jyrq and lab_result.ybh=lab_pat.ybh and result_flag in('H','L','P')) as ycjg, + right(replicate(' ',20) + ybh,20) as cp_ybh,jyrq,yq FROM lab_pat where jyrq = #{jyrq} and yq = #{yq} and ${ybh} and jgbz = '2' - '']]> - '1')]]> - '2')]]> - - - "'" + #{brly} + "'")]]> - - + and ltrim(brxm) != '' + and isnull(dybz,'') != '1' + and isnull(jgbz,'') != '2' + and jgbz = '2' + and isnull(ksdh,'') != #{ksdh} + and ksdh = #{ksdh} + and isnull(brly,'') != #{brly} + and brly = #{brly} + and (select count(1) from lab_result where lab_result.yq=lab_pat.yq and lab_result.jyrq=lab_pat.jyrq and lab_result.ybh=lab_pat.ybh and result_flag in('H','L','P'))>0 + and (select count(1) from lab_result where lab_result.yq=lab_pat.yq and lab_result.jyrq=lab_pat.jyrq and lab_result.ybh=lab_pat.ybh and result_flag in('H','L','P'))=0 + order by ksdh,ch,ybh order by brly,ksdh,ch,ybh order by brly,ksdh,ybh order by ycjg,ybh - order by ybh + order by right(replicate(' ',20) + ybh,20)