From df0b661a98cd5e91fbbbba08e54dc610076517c0 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期四, 18 七月 2024 17:04:28 +0800 Subject: [PATCH] pdf去除页眉增加页码调整检验医师边距 --- ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java index 48071e9..cbdd7df 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java @@ -114,7 +114,7 @@ Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0); String hisRegistrationId = resultDatasss.get("his_registration_id").toString(); //淇濆瓨鎸傚彿鍏ュ弬鍑哄弬 - resultDatasss.put("cardId", customer.getCardId()); + resultDatasss.put("cardId",hisRegistrationId); JSONObject object4 = JSONUtil.parseObj(resultDatasss); LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinregapply"); @@ -123,8 +123,10 @@ //闂ㄨ瘖鍖荤敓鎺ヨ瘖 controller.Outpinconapply(hisRegistrationId, date, "00029"); - customer.setCardId(hisRegistrationId); - customerService.updateById(customer); + if(null != tjOrder.getTjCategory() && !tjOrder.getTjCategory().equals("13")){ + customer.setCardId(hisRegistrationId); + customerService.updateById(customer); + } transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(), hisRegistrationId, tjOrder.getTjNumber()); tjOrder.setCardId(hisRegistrationId); orderService.updateById(tjOrder); @@ -205,12 +207,12 @@ if(project.getProId()==1740177341251154377L){ OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); detilsDto.setYpbm("00006670"); - detilsDto.setPcbm("1"); - detilsDto.setSl(1); - detilsDto.setDj(60); - detilsDto.setDcjl(1); - detilsDto.setPj(60); - detilsDto.setJj(60); + detilsDto.setPcbm("06"); + detilsDto.setSl("1"); + detilsDto.setDj("60"); + detilsDto.setDcjl("1"); + detilsDto.setPj("60"); + detilsDto.setJj("60"); outpinmedicapplyDetilsDtos.add(detilsDto); } } @@ -276,6 +278,8 @@ dto1.setSjrq(date); dto1.setCzybm("00029"); dto1.setCzyksbm("0101"); + dto1.setCflxbm("A"); + dto1.setYfbm("1"); dto1.setDetails(outpinmedicapplyDetilsDtos); AjaxResult result = controller.Outpinmedicapply(dto1); String result1 = getAjaxResult(result); -- Gitblit v1.8.0