| 2025-04-27 | zjh |  |
| 2025-04-27 | zhaowenxuan | |
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -3,9 +3,12 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.hosp.domain.TjCustomer; import com.ltkj.hosp.domain.TjOrder; import com.ltkj.hosp.mapper.TjCustomerMapper; import com.ltkj.hosp.service.ITjOrderService; import com.ltkj.web.controller.system.TjCheckController; import com.ltkj.web.controller.system.TjReportController; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +38,8 @@ private TjCheckController tjCheckController; @Autowired private TjCustomerMapper tjCustomerMapper; @Autowired private ITjOrderService tjOrderService; /** * 提供给三方调用的报告查看接口 @@ -45,6 +50,13 @@ public void viewReport(HttpServletResponse response, @RequestBody String json) throws IOException { JSONObject entries = JSONUtil.parseObj(json); String tjNum = entries.getStr("tjNum"); LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjOrder::getHeshouStatus,1); wrapper.eq(TjOrder::getTjNumber,tjNum); List<TjOrder> list = tjOrderService.list(wrapper); if (list.isEmpty()){ return; } tjReportController.preview(response,true,tjNum); } @@ -56,6 +68,13 @@ @PostMapping("/reportData") public AjaxResult reportData(@RequestBody String json){ String tjNum = JSONUtil.parseObj(json).getStr("tjNum"); LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjOrder::getHeshouStatus,1); wrapper.eq(TjOrder::getTjNumber,tjNum); List<TjOrder> list = tjOrderService.list(wrapper); if (list.isEmpty()){ return AjaxResult.error("暂无数据！！"); } JSONObject entries = JSONUtil.parseObj(tjCheckController.updateCheckType(tjNum)); removeNullFields(entries); return JSONUtil.toBean(entries, AjaxResult.class); ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -49,6 +49,9 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.math.BigDecimal; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.text.Collator; import java.text.SimpleDateFormat; import java.util.*; @@ -122,6 +125,8 @@ private ITjProAdvicerulesService tjProAdvicerulesService; @Autowired private TjOrderYcxmService ycxmService; @Resource private TjXdtgmdjgService xdtgmdjgService; private Integer pdfPage = 0; @@ -1737,6 +1742,46 @@ log.error(String.valueOf(e)); return AjaxResult.error(); } LambdaQueryWrapper<TjXdtgmdjg> wqq=new LambdaQueryWrapper<>(); wqq.eq(TjXdtgmdjg::getTjh,tjOrder.getTjNumber()); wqq.isNotNull(TjXdtgmdjg::getUrl); List<TjXdtgmdjg> xdtgmdjgList = xdtgmdjgService.list(wqq); int index=1; for (TjXdtgmdjg xdtgmdjg : xdtgmdjgList) { document.newPage(); cell = new PdfPCell(); PdfPTable tablefj = new PdfPTable(new float[]{100f}); tablefj.setTotalWidth(PageSize.A4.getWidth() - 100); tablefj.setLockedWidth(true); tablefj.setHorizontalAlignment(Element.ALIGN_LEFT); tablefj.getDefaultCell().setBorder(0); tablefj.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT); cell.setBorder(Rectangle.NO_BORDER); cell.setVerticalAlignment(Element.ALIGN_MIDDLE); cell.setHorizontalAlignment(Element.ALIGN_CENTER); cell.setPaddingTop(10); cell.setPaddingBottom(10); cell.setPhrase(new Phrase("附件"+index+": "+ xdtgmdjg.getProName(), zongJianFont)); Path path = Paths.get(xdtgmdjg.getUrl()); byte[] bytesfj = null; try { bytesfj = Files.readAllBytes(path); } catch (IOException e) { throw new RuntimeException(e); } Image image = Image.getInstance(bytesfj); image.scaleToFit(500, 2500); tablefj.addCell(cell); cell = new PdfPCell(); cell.addElement(image); tablefj.addCell(cell); document.add(tablefj); index++; } document.close(); @@ -1761,7 +1806,7 @@ AcroFields acroFields = pdfStamper.getAcroFields(); BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED); acroFields.addSubstitutionFont(bf); HashMap<String, Object> data = new HashMap<>(); // HashMap<String, Object> data = new HashMap<>(); Long cusSex = customer.getCusSex(); String tjtype; if (cusSex == 0) { @@ -1781,10 +1826,6 @@ if (StrUtil.isNotBlank(tjOrder.getFirmName())) { hashMap.put("work", tjOrder.getFirmName()); } else { // LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>(); // wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId()); // DictComp dictComp = dictCompService.getOne(wq111); if (StrUtil.isBlank(tjOrder.getFirmName())) { hashMap.put("work", "无"); } else { @@ -1828,6 +1869,9 @@ PdfImportedPage page = copy.getImportedPage(reader2, i); copy.addPage(page); } reader2.close(); PdfReader reader1 = new PdfReader(byteArrayOutputStream.toByteArray()); ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -210,13 +210,13 @@ @ApiParam(value = "姓名)") @RequestParam(required = false) String name, @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page, @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) { List<Long> ksproList = null; ksproList = projectService.getHuaYanProId(); if (ksproList == null || ksproList.isEmpty()) { return AjaxResult.error("请完善科室项目信息"); } // List<Long> ksproList = null; // // ksproList = projectService.getHuaYanProId(); // // if (ksproList == null || ksproList.isEmpty()) { // return AjaxResult.error("请完善科室项目信息"); // } Map<String, Object> map = null; if (type == 0) { ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -153,7 +153,7 @@ List<TjProject> getPacTjProjectList(); @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y' and a.pro_status=0") @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.org_type=1 AND a.need_report='Y' and a.pro_status=0") List<Long> getHuaYanProId(); @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y' and a.pro_status=0")
