ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -2394,9 +2394,12 @@ //临时表添加单项 public void saveRedisTransitionByProId(String cusId,String cardId, List<Long> proIds) { for (Long proId : proIds) { List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); if (null != transitionList && transitionList.size() > 0) { continue; TjProject project = projectService.selectTjProjectByProId(proId); if(null !=project && (!project.getProName().contains("静脉采血")|| !project.getProName().contains("费"))){ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); if (null != transitionList && transitionList.size() > 0) { continue; } } transitionService.saveRedisTransitionByProId(cusId,cardId, proId); } ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1606,6 +1606,7 @@ return AjaxResult.success("该用户暂时没有体检数据"); } List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList); List<TjOrderDetail> tjOrderDetailList=new ArrayList<>(); TjCustomer customer = tjCustomerService.getById(one.getUserId()); if (null != tjOrderDetails && tjOrderDetails.size() > 0) { for (TjOrderDetail tjOrderDetail : tjOrderDetails) { @@ -1681,6 +1682,7 @@ } else { tjOrderDetail.setDoctorName(null); } tjOrderDetailList.add(tjOrderDetail); } } Map<String, Object> map = new HashMap<>(); @@ -1700,7 +1702,7 @@ } else { map.put("xiaoJieIds", null); } map.put("sons", tjOrderDetails); map.put("sons", tjOrderDetailList); map.put("xiaoJie", adviceList); map.put("remark", remark.getRemark());
