From 0d4a80fd817b39417ad7eee88aa5d14bf571f79c Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期五, 28 六月 2024 17:29:09 +0800 Subject: [PATCH] zjh 本地 2024/06/28 --1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index b38be14..66c90b8 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -46,6 +46,7 @@ import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; import com.ltkj.hosp.domain.*; import com.ltkj.hosp.dto.QianDaoDto; +import com.ltkj.hosp.hisDto.OutpinimpapplyDto; import com.ltkj.hosp.mapper.TestMapper; import com.ltkj.hosp.service.*; import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail; @@ -66,6 +67,7 @@ import com.ltkj.system.service.ISysUserService; import com.ltkj.web.controller.his.HisApiGetMethodService; import com.ltkj.web.controller.his.HisApiMethod; +import com.ltkj.web.controller.his.HisApiMethodService; import com.ltkj.web.controller.his.HisMzJysqController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -188,7 +190,8 @@ private HisApiGetMethodService hisApiGetMethodService; @Autowired private ISysDeptService sysDeptService; - + @Autowired + private HisApiMethodService controller; /** * 鏌ヨ浣撴璁板綍鍒楄〃 @@ -1597,9 +1600,9 @@ asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds); for (Long proId : proIds) { List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); - if (null != transitions && transitions.size() > 0) { - continue; - } +// if (null != transitions && transitions.size() > 0) { +// continue; +// } TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId)); if (null != tjProject) { // List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); @@ -1855,6 +1858,35 @@ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId()); customer.setCardId("0"); tjCustomerService.updateById(customer); + String config = configService.selectConfigByKey("sfkqdyhis"); + if(null !=config && config.equals("Y")){ + final String date = DateUtil.format(tjOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); + OutpinimpapplyDto dto=new OutpinimpapplyDto(); + dto.setHisRegistrationId(tjOrder.getCardId()); + dto.setMzzdid(1); + dto.setSqysbm("00029"); + dto.setMzksbm("0101"); + dto.setFbrq(date); + dto.setZdrq(date); + dto.setCzybm("00029"); + dto.setCzyksbm("0101"); + dto.setZs("鍋ュ悍鏌ヤ綋"); + dto.setBs("涓嶈"); + dto.setClyz(""); + dto.setJws(""); + dto.setTgjc(""); + dto.setGms(""); + dto.setJbbm("Z00.001"); + dto.setJbbm1(""); + dto.setJbbm2(""); + dto.setFzbz("1"); + dto.setHzqx("6"); + dto.setSfqc("0"); + dto.setQchs(""); + dto.setSfqj("0"); + dto.setJzqk(9); + controller.Outpinimpapply(dto); + } return AjaxResult.success("绛剧鎴愬姛锛�"); } else { -- Gitblit v1.8.0