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 b7f6ab9..25290d3 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 @@ -1,7 +1,9 @@ package com.czlis.interfaceCommon.utils; - +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONUtil; import com.czlis.common.config.RuoYiConfig; import com.czlis.interfaceCommon.mapper.BackPaperMapper; @@ -15,12 +17,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; - @Component @Slf4j public class ReportUtil { @@ -28,34 +30,38 @@ public class ReportUtil { CommonUtil commonUtil; @Autowired BackPaperMapper backPaperMapper; + + public void printBarCode(MZBarCodeParam mzBarCodeParam) { try { //构造数据 Map parameters = new HashMap(); - parameters.put("barcode",mzBarCodeParam.getSqh()); - parameters.put("line1",mzBarCodeParam.getBrxm() + " " + mzBarCodeParam.getBrxb() + " " + mzBarCodeParam.getNl()); - parameters.put("line2",mzBarCodeParam.getSfxmmc()); - JasperReportUtil.print(RuoYiConfig.getMzPrintName(),"barcode",parameters); + parameters.put("barcode", mzBarCodeParam.getSqh()); + parameters.put("line1", mzBarCodeParam.getBrxm() + " " + mzBarCodeParam.getBrxb() + " " + mzBarCodeParam.getNl()); + parameters.put("line2", mzBarCodeParam.getSfxmmc()); + JasperReportUtil.print(RuoYiConfig.getMzPrintName(), "barcode", parameters); } catch (Exception e) { e.printStackTrace(); - log.error("打印条码报错,条码号：{}",mzBarCodeParam.getSqh(),e); + log.error("打印条码报错,条码号：{}", mzBarCodeParam.getSqh(), e); } } + + public void printBackpaper(List sqhs) { - String sqh= sqhs.get(0); - BackPaperParam backPaperParam=backPaperMapper.selectReqmian(sqh); - ObjectMapper objectMapper = new ObjectMapper(); - Map parameters = objectMapper.convertValue(backPaperParam,Map.class); - parameters.put("company",commonUtil.getCompany(backPaperParam.getYljg())); - parameters.put("age",AgeUtils.getAge(backPaperParam.getBrsr())); - parameters.put("ksdh",commonUtil.getComDictNameById("DP",backPaperParam.getKsdh())); - parameters.put("brxb",commonUtil.getComDictNameById("SX",backPaperParam.getBrxb())); - parameters.put("bgds",String.valueOf(sqhs.size())); - List detailList= backPaperMapper.selectBySqhs(sqhs); + String sqh = sqhs.get(0); + BackPaperParam backPaperParam = backPaperMapper.selectReqmian(sqh); + // ObjectMapper objectMapper = new ObjectMapper(); + Map parameters = BeanUtil.beanToMap(backPaperParam); + parameters.put("company", commonUtil.getCompany(backPaperParam.getYljg())); + parameters.put("age", AgeUtils.getAge(backPaperParam.getBrsr())); + parameters.put("ksdh", commonUtil.getComDictNameById("DP", backPaperParam.getKsdh())); + parameters.put("brxb", commonUtil.getComDictNameById("SX", backPaperParam.getBrxb())); + parameters.put("bgds", String.valueOf(sqhs.size())); + List detailList = backPaperMapper.selectBySqhs(sqhs); for (BackPaperDetail detail : detailList) { - Integer bglqdh1=detail.getBglqdh1(); - Integer bglqdh2=detail.getBglqdh2(); - String bglqsm=""; + Integer bglqdh1 = detail.getBglqdh1(); + Integer bglqdh2 = detail.getBglqdh2(); + String bglqsm = ""; if (bglqdh1 != null) { List labRptgetruledetail = backPaperMapper.getLabRptgetruledetail(bglqdh1); if (labRptgetruledetail.size() > 0) { @@ -63,9 +69,9 @@ public class ReportUtil { } } if (bglqdh2 != null && bglqsm != null && !bglqsm.trim().equals("")) { - List labRptgetruledetail= backPaperMapper.getLabRptgetruledetail(bglqdh2); + List labRptgetruledetail = backPaperMapper.getLabRptgetruledetail(bglqdh2); if (labRptgetruledetail.size() > 0) { - bglqsm=labRptgetruledetail.get(0).getBglqsm(); + bglqsm = labRptgetruledetail.get(0).getBglqsm(); } } detail.setCp_msg(bglqsm); @@ -74,10 +80,11 @@ public class ReportUtil { try { //构造数据 - JasperReportUtil.print(RuoYiConfig.getMzPrintName(),"backpaper",parameters,detailList); + System.out.println("入参参数："+parameters.toString()); + JasperReportUtil.print(RuoYiConfig.getMzPrintName(), "backpaper", parameters, detailList); } catch (Exception e) { e.printStackTrace(); - log.error("打印回单报错,条码号：{}",sqh,e); + log.error("打印回单报错,条码号：{}", sqh, e); } } diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java index d33360b..a87a70b 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java @@ -1,5 +1,6 @@ package com.czlis.mzcx.controller; +import com.czlis.common.annotation.Anonymous; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; @@ -53,6 +54,8 @@ public class MZCXController extends BaseController { public Result printAll(@RequestBody List sqhs){ return mzcxService.printAll(sqhs); } + + @Anonymous @PostMapping("/printBackpaper") public Result printBackpaper(@RequestBody List sqhs){ return mzcxService.printBackpaper(sqhs); diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java index d21fcf7..21abd54 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/MZCXServiceImpl.java @@ -38,7 +38,7 @@ public class MZCXServiceImpl implements MZCXService { private CommonUtil commonUtil; @Override - public Result querySQD(String brdh, String stime, String etime, String klx,String zt) { + public Result querySQD(String brdh, String stime, String etime, String klx, String zt) { GetReqInterface getReqInterface = new GetReqInterface(); getReqInterface.setBrdh(brdh); getReqInterface.setStime(stime); @@ -57,9 +57,9 @@ public class MZCXServiceImpl implements MZCXService { map.put("st", stime); map.put("et", etime); map.put("klx", klx); - map.put("zt",zt); - map.put("as_yljg","1"); - return new Result("0","查询成功！",mzcxMapper.querySQD(map)); + map.put("zt", zt); + map.put("as_yljg", "1"); + return new Result("0", "查询成功！", mzcxMapper.querySQD(map)); } @Override @@ -70,21 +70,28 @@ public class MZCXServiceImpl implements MZCXService { dayMessage.setIp(IpUtils.getIpAddr()); dayMessage.setUserid(SecurityUtils.getLoginUser().getUsername()); String jsonStr = JSONUtil.toJsonStr(dayMessage); - Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, jsonStr); + Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, jsonStr); if (result != null && result.getData() != null) { - try { - JSONObject json=JSONUtil.parseFromXml(result.getData().toString()); - String listkey=json.keySet().iterator().next(); - JSONObject response=json.getJSONObject(listkey); - String infokey=response.keySet().iterator().next(); - List patientList=response.getBeanList(infokey, OutPatListDTO.class); - return new Result("0","查询成功！",patientList); - } catch (Exception e) { - log.error("XML转换outPatListDTO失败: {}", e.getMessage(), e); - } - } - return new Result("0","查询成功！",new OutPatListDTO()); + try { + JSONObject json = JSONUtil.parseFromXml(result.getData().toString()); + String listkey = json.keySet().iterator().next(); + JSONObject response = json.getJSONObject(listkey); + String infokey = response.keySet().iterator().next(); + List patientList = response.getBeanList(infokey, OutPatListDTO.class); + return new Result("0", "查询成功！", patientList); + } catch (Exception e) { + log.error("XML转换outPatListDTO失败: {}", e.getMessage(), e); + } + } + return new Result("0", "查询成功！", new OutPatListDTO()); } + + /** + * 打印条码 + * + * @param sqh + * @return + */ @Override public Result printSQD(String sqh) { LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh); @@ -95,10 +102,10 @@ public class MZCXServiceImpl implements MZCXService { String age = ageFromBirthDay.get("age"); String unit = ageFromBirthDay.get("unit"); - mzBarCodeParam.setNl(age+unit); + mzBarCodeParam.setNl(age + unit); mzBarCodeParam.setBrxm(labReqmainOne.getBrxm()); String brxb = labReqmainOne.getBrxb(); - switch (brxb){ + switch (brxb) { case "1": brxb = "男"; break; @@ -112,21 +119,28 @@ public class MZCXServiceImpl implements MZCXService { mzBarCodeParam.setBrxb(brxb); mzBarCodeParam.setSfxmmc(labReqmainOne.getJymd()); reportUtil.printBarCode(mzBarCodeParam); - return new Result("0","打印成功！"); + return new Result("0", "打印成功！"); } + @Override public Result printAll(List sqhs) { for (String sqh : sqhs) { printSQD(sqh); } - return new Result("0","打印成功！"); + return new Result("0", "打印成功！"); } + /** + * 打印回单接口 + * + * @param sqhs + * @return + */ @Override - public Result printBackpaper(List sqhs){ + public Result printBackpaper(List sqhs) { log.info("aaaaa: {}", sqhs); reportUtil.printBackpaper(sqhs); - return new Result("0","打印成功！"); + return new Result("0", "打印成功！"); } }