ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -6,6 +6,7 @@ import com.ltkj.hosp.domain.*; import com.ltkj.hosp.mapper.TjSamplingMapper; import com.ltkj.hosp.service.*; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -64,8 +65,22 @@ LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjFlowingWater::getHisWaterId, feiYongId); TjFlowingWater water = tjFlowingWaterService.getOne(wrapper); if(null !=water){ water.setPayStasus(1L); tjFlowingWaterService.updateById(water); if (tjFlowingWaterService.updateById(water)) { String jxbz = water.getJxbz(); if(StringUtil.isNotBlank(jxbz)){ tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString()); remarkService.updateTjOrderRemarkSfbzByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString()); }else { tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString()); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString()); } } }else { return AjaxResult.error("查不到流水号: "+feiYongId); } }else { LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjFlowingWater::getHisTfWaterId, feiYongId).or().eq(TjFlowingWater::getHisWaterId, feiYongId); ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -290,11 +290,13 @@ if (null != tjReservation && tjReservation.getPayType() == 1) { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); } } if (tjFlowingWater.getPayStasus() == 1) { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); } if (tjFlowingWater.getDiscount() == null) { transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber()); @@ -341,8 +343,8 @@ @Override @Async("async") public void collectFees(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList, SysUser sysUser, String discount) { orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber()); redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber()); // orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber()); // redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber()); for (TbTransition transition : tbTransitionList) { // transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).divide(BigDecimal.valueOf(10)))); // transitionService.updateById(transition); @@ -367,33 +369,33 @@ //父项 ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new)); List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList()); if (parentProIds.size() > 0) { if (!parentProIds.isEmpty()) { for (Long parentProId : parentProIds) { TjProject parentProject = projectService.selectTjProjectByProId(parentProId); if (null != parentProject) { LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>(); wqqq.eq(TjProConsumables::getProId, parentProject.getProId()); List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq); if (null != proConsumables && proConsumables.size() > 0) { if (null != proConsumables && !proConsumables.isEmpty()) { for (TjProConsumables tjProConsumables : proConsumables) { TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()); list2.add(tjConsumables); } } TjOrderRemark tjOrderRemark = new TjOrderRemark(); tjOrderRemark.setProId(parentProId); tjOrderRemark.setProName(parentProject.getProName()); tjOrderRemark.setDeptId(parentProject.getDeptId()); tjOrderRemark.setTjNumber(order.getTjNumber()); tjOrderRemark.setCreateBy(sysUser.getNickName()); tjOrderRemark.setCreateTime(new Date()); tjOrderRemark.setUpdateBy(sysUser.getNickName()); tjOrderRemark.setUpdateTime(new Date()); tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId())); tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId())); orderRemarkService.save(tjOrderRemark); Map<String, Object> map = getOrderDetailByProParentId(String.valueOf(parentProId), order.getTjNumber()); redisCache.setCacheMapValue("getOrderDetailByProParentId" + order.getTjNumber(), String.valueOf(parentProId), map); // TjOrderRemark tjOrderRemark = new TjOrderRemark(); // tjOrderRemark.setProId(parentProId); // tjOrderRemark.setProName(parentProject.getProName()); // tjOrderRemark.setDeptId(parentProject.getDeptId()); // tjOrderRemark.setTjNumber(order.getTjNumber()); // tjOrderRemark.setCreateBy(sysUser.getNickName()); // tjOrderRemark.setCreateTime(new Date()); // tjOrderRemark.setUpdateBy(sysUser.getNickName()); // tjOrderRemark.setUpdateTime(new Date()); // tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId())); // tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId())); // orderRemarkService.save(tjOrderRemark); // Map<String, Object> map = getOrderDetailByProParentId(String.valueOf(parentProId), order.getTjNumber()); // redisCache.setCacheMapValue("getOrderDetailByProParentId" + order.getTjNumber(), String.valueOf(parentProId), map); } } } @@ -416,11 +418,6 @@ chargingStandardService.save(tjChargingStandard); } // LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>(); // wq.eq(TjOrderDetail::getOrderId, order.getOrderId()); // wq.isNotNull(TjOrderDetail::getFlowingWaterId); // wq.eq(TjOrderDetail::getIsSampling, 0); // List<TjOrderDetail> detailList = tjOrderDetailService.list(wq); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null); } @@ -601,21 +598,9 @@ String config = configService.selectConfigByKey("sfkqdyhis"); // //检验 // List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); // // //检查 // List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>(); // // // //处置 // List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>(); // // List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>(); List<TjProject> projectList=new ArrayList<>(); ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>(); // ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>(); for (String tjProId : tjProIds) { TjProject project = projectService.getById(Long.valueOf(tjProId)); if (null != project && project.getProParentId() == 0) { @@ -665,130 +650,6 @@ tjOrderDetailService.save(detail1); } if(null !=config && config.equals("Y")){ //检验 // if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJyDeptIds().contains(project.getDeptId().toString())) { // if (null != project.getHisXmbm()) { // OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); // detailsDto.setMxfyxmbm(project.getHisXmbm()); // if (project.getSfzhfy().equals("Y")) { // detailsDto.setSfzhfy("1"); // } else { // detailsDto.setSfzhfy("0"); // } // detailsDto.setSl(project.getSl()); // detailsDtos.add(detailsDto); // } // if(project.getProId()==1740177341251154377L){ // OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); // detilsDto.setYpbm("00006670"); // detilsDto.setPcbm("06"); // detilsDto.setSl("1"); // detilsDto.setDj("60"); // detilsDto.setDcjl("1"); // detilsDto.setPj("60"); // detilsDto.setJj("60"); // detilsDto.setJldw(""); // detilsDto.setTjbm(""); // detilsDto.setPs(""); // detilsDto.setPsbm(""); // detilsDto.setYyts(""); // detilsDto.setXtph(""); // detilsDto.setScph(""); // detilsDto.setYpxq(""); // detilsDto.setCdbm(""); // detilsDto.setKfdw(""); // detilsDto.setYfdw(""); // detilsDto.setYysm(""); // detilsDto.setFzbl("1"); // detilsDto.setZh("0"); // outpinmedicapplyDetilsDtos.add(detilsDto); // } // } //检查 // if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) { // if (null != project.getHisXmbm()) { // OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); // detailsDto.setMxfyxmbm(project.getHisXmbm()); // if (project.getSfzhfy().equals("Y")) { // detailsDto.setSfzhfy("1"); // } else { // detailsDto.setSfzhfy("0"); // } // detailsDto.setSl(project.getSl()); // detailsDtoss.add(detailsDto); // } // if(project.getProId()==1740177341251154377L){ // OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); // detilsDto.setYpbm("00006670"); // detilsDto.setPcbm("06"); // detilsDto.setSl("1"); // detilsDto.setDj("60"); // detilsDto.setDcjl("1"); // detilsDto.setPj("60"); // detilsDto.setJj("60"); // detilsDto.setJldw(""); // detilsDto.setTjbm(""); // detilsDto.setPs(""); // detilsDto.setPsbm(""); // detilsDto.setYyts(""); // detilsDto.setXtph(""); // detilsDto.setScph(""); // detilsDto.setYpxq(""); // detilsDto.setCdbm(""); // detilsDto.setKfdw(""); // detilsDto.setYfdw(""); // detilsDto.setYysm(""); // detilsDto.setFzbl("1"); // detilsDto.setZh("0"); // outpinmedicapplyDetilsDtos.add(detilsDto); // } // } //处置 // if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getCzDeptIds().contains(project.getDeptId().toString())) { // if (null != project.getHisXmbm()) { // OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); // detailsDto.setMxfyxmbm(project.getHisXmbm()); // if (project.getSfzhfy().equals("Y")) { // detailsDto.setSfzhfy("1"); // } else { // detailsDto.setSfzhfy("0"); // } // detailsDto.setSl(project.getSl()); // detailDtos.add(detailsDto); // } // if(project.getProId()==1740177341251154377L){ // OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); // detilsDto.setYpbm("00006670"); // detilsDto.setPcbm("06"); // detilsDto.setSl("1"); // detilsDto.setDj("60"); // detilsDto.setDcjl("1"); // detilsDto.setPj("60"); // detilsDto.setJj("60"); // detilsDto.setJldw(""); // detilsDto.setTjbm(""); // detilsDto.setPs(""); // detilsDto.setPsbm(""); // detilsDto.setYyts(""); // detilsDto.setXtph(""); // detilsDto.setScph(""); // detilsDto.setYpxq(""); // detilsDto.setCdbm(""); // detilsDto.setKfdw(""); // detilsDto.setYfdw(""); // detilsDto.setYysm(""); // detilsDto.setFzbl("1"); // detilsDto.setZh("0"); // outpinmedicapplyDetilsDtos.add(detilsDto); // } // } } } else { //如果该项目存在 则 不保存 @@ -816,7 +677,7 @@ detail.setUpdateId(String.valueOf(sysUser.getUserId())); detail.setJxbz(jxbz); tjOrderDetailService.save(detail); tjOrderDetails.add(detail); // tjOrderDetails.add(detail); } @@ -830,13 +691,9 @@ } // TODO 和签到登记一样 只有配置中的以及收费类型为体检票时才增加到采样管理表 // List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz); // addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz); tjOrderDetails = new ArrayList<>(); // tjOrderDetails = new ArrayList<>(); ArrayList<TjProject> jianChaProjects = new ArrayList<>(); // ArrayList<TjProject> jianYanProjects = new ArrayList<>(); if(!projectList.isEmpty()){ List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList()); @@ -868,421 +725,33 @@ detail1.setUpdateId(String.valueOf(sysUser.getUserId())); detail1.setJxbz(jxbz); tjOrderDetailService.save(detail1); tjOrderDetails.add(detail1); // if(null !=config && config.equals("Y")){ //检验 // if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJyDeptIds().contains(project.getDeptId().toString())) { // if (null != project.getHisXmbm()) { // jianYanProjects.add(project); // OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); // // detailsDto.setMxfyxmbm(project.getHisXmbm()); // // if (project.getSfzhfy().equals("Y")) { // detailsDto.setSfzhfy("1"); // } else { // detailsDto.setSfzhfy("0"); // } // detailsDto.setSl(project.getSl()); // detailsDtos.add(detailsDto); // } // if(project.getProId()==1740177341251154377L){ // OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); // detilsDto.setYpbm("00006670"); // detilsDto.setPcbm("06"); // detilsDto.setSl("1"); // detilsDto.setDj("60"); // detilsDto.setDcjl("1"); // detilsDto.setPj("60"); // detilsDto.setJj("60"); // detilsDto.setJldw(""); // detilsDto.setTjbm(""); // detilsDto.setPs(""); // detilsDto.setPsbm(""); // detilsDto.setYyts(""); // detilsDto.setXtph(""); // detilsDto.setScph(""); // detilsDto.setYpxq(""); // detilsDto.setCdbm(""); // detilsDto.setKfdw(""); // detilsDto.setYfdw(""); // detilsDto.setYysm(""); // detilsDto.setFzbl("1"); // detilsDto.setZh("0"); // outpinmedicapplyDetilsDtos.add(detilsDto); // } // } //检查 // tjOrderDetails.add(detail1); if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) { if (null != project.getHisXmbm()) { jianChaProjects.add(project); // OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); // detailsDto.setMxfyxmbm(project.getHisXmbm()); // if (project.getSfzhfy().equals("Y")) { // detailsDto.setSfzhfy("1"); // } else { // detailsDto.setSfzhfy("0"); // } // detailsDto.setSl(project.getSl()); // detailsDtoss.add(detailsDto); } // if(project.getProId()==1740177341251154377L){ // OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); // detilsDto.setYpbm("00006670"); // detilsDto.setPcbm("06"); // detilsDto.setSl("1"); // detilsDto.setDj("60"); // detilsDto.setDcjl("1"); // detilsDto.setPj("60"); // detilsDto.setJj("60"); // detilsDto.setJldw(""); // detilsDto.setTjbm(""); // detilsDto.setPs(""); // detilsDto.setPsbm(""); // detilsDto.setYyts(""); // detilsDto.setXtph(""); // detilsDto.setScph(""); // detilsDto.setYpxq(""); // detilsDto.setCdbm(""); // detilsDto.setKfdw(""); // detilsDto.setYfdw(""); // detilsDto.setYysm(""); // detilsDto.setFzbl("1"); // detilsDto.setZh("0"); // outpinmedicapplyDetilsDtos.add(detilsDto); // } } //处置 // if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getCzDeptIds().contains(project.getDeptId().toString())) { // if (null != project.getHisXmbm()) { // OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); // detailsDto.setMxfyxmbm(project.getHisXmbm()); // if (project.getSfzhfy().equals("Y")) { // detailsDto.setSfzhfy("1"); // } else { // detailsDto.setSfzhfy("0"); // } // detailsDto.setSl(project.getSl()); // detailDtos.add(detailsDto); // } // if(project.getProId()==1740177341251154377L){ // OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto(); // detilsDto.setYpbm("00006670"); // detilsDto.setPcbm("06"); // detilsDto.setSl("1"); // detilsDto.setDj("60"); // detilsDto.setDcjl("1"); // detilsDto.setPj("60"); // detilsDto.setJj("60"); // detilsDto.setJldw(""); // detilsDto.setTjbm(""); // detilsDto.setPs(""); // detilsDto.setPsbm(""); // detilsDto.setYyts(""); // detilsDto.setXtph(""); // detilsDto.setScph(""); // detilsDto.setYpxq(""); // detilsDto.setCdbm(""); // detilsDto.setKfdw(""); // detilsDto.setYfdw(""); // detilsDto.setYysm(""); // detilsDto.setFzbl("1"); // detilsDto.setZh("0"); // outpinmedicapplyDetilsDtos.add(detilsDto); // } // } // } } // TODO 和签到登记一样 只有配置中的以及收费类型为体检票时才增加到采样管理表 if(config.equals("Y")){ if(config.equalsIgnoreCase("Y")){ if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) { List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz); addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz); } }else { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(order.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString()); orderRemarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString()); List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz); addCaiYangDengJiByDiaoYongShiTu(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz); } } // Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order); if(null !=config && config.equals("Y")){ AjaxResult result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L); if (!result.get("code").toString().equals("200")) return false; // if (useLisAndPacsRegister) { // List<TjProject> projectList2 = jianYanProjects.stream().distinct().collect(Collectors.toList()); // 检查申请 // pacsReg(order, customer, jianChaProjects); // }else { /* //检验申请 if(!detailsDtos.isEmpty()){ OutpintestapplyDto dto = new OutpintestapplyDto(); dto.setHisRegistrationId(order.getCardId()); dto.setSfzh(customer.getCusIdcard()); dto.setSqysbm("00029"); dto.setMzksbm("0101"); dto.setSjrq(date); dto.setCzybm("00029"); dto.setCzyksbm("0101"); dto.setSfjz("0"); dto.setDetails(detailsDtos.stream().distinct().collect(Collectors.toList())); AjaxResult ajaxResult1 = controller.Outpintestapply(dto); String result5 = getAjaxResult(ajaxResult1); JSONObject object3 = getJSONObject(result5); String code3 = object3.getStr("ResultCode"); if (code3.equals("0")) { List<OutpintestapplyDetailsDto> details = dto.getDetails(); for (OutpintestapplyDetailsDto detail : details) { LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); tree.setSfjx("Y"); tree.setJxbz(jxbz); tree.setCardId(dto.getHisRegistrationId()); LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>(); wrapper4.eq(TjCustomer::getCardId, tree.getCardId()); TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4); tree.setPationid(tjCustomer.getPationId()); JSONObject resultData = object3.getJSONObject("ResultData"); tree.setSqdh(resultData.getStr("jysqdh")); tree.setFyhj(resultData.getStr("fyhj")); String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("检验"); LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); wrapper.eq(TjProject::getProParentId,0); List<TjProject> list = projectService.list(wrapper); String tj_price = ""; for (TjProject project : list) { tj_price += project.getProPrice() + "、"; } tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1)); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); tree.setXmfl(ejjfxmzd.getYjkmdm()); } tree.setCreateTime(dates); ltkjJianchajianyanTreeService.save(tree); } // List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); // addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz); } } //门诊检查申请 if(!detailsDtoss.isEmpty()){ OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); outpinexamapplyDto.setHisRegistrationId(order.getCardId()); outpinexamapplyDto.setSfzh(customer.getCusIdcard()); outpinexamapplyDto.setSqysbm("00029"); outpinexamapplyDto.setMzksbm("0101"); outpinexamapplyDto.setCzybm("00029"); outpinexamapplyDto.setCzyksbm("0101"); outpinexamapplyDto.setSfjz("0"); outpinexamapplyDto.setDetails(detailsDtoss.stream().distinct().collect(Collectors.toList())); AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto); String result6 = getAjaxResult(ajaxResult2); JSONObject object5 = getJSONObject(result6); String code4 = object5.getStr("ResultCode"); if (code4.equals("0")) { List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails(); for (OutpintestapplyDetailsDto detail : details) { LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); tree.setSfjx("Y"); tree.setJxbz(jxbz); tree.setCardId(outpinexamapplyDto.getHisRegistrationId()); LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>(); wrapper4.eq(TjCustomer::getCardId, tree.getCardId()); TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4); tree.setPationid(tjCustomer.getPationId()); JSONObject resultData = object5.getJSONObject("ResultData"); tree.setSqdh(resultData.getStr("jcsqdh")); tree.setFyhj(resultData.getStr("fyhj")); String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("检查"); LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); wrapper.eq(TjProject::getProParentId,0); List<TjProject> list = projectService.list(wrapper); String tj_price = ""; for (TjProject project : list) { tj_price += project.getProPrice() + "、"; } tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1)); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); tree.setXmfl(ejjfxmzd.getYjkmdm()); } tree.setCreateTime(dates); ltkjJianchajianyanTreeService.save(tree); } } }*/ // } /* //药品申请 if(!outpinmedicapplyDetilsDtos.isEmpty()){ OutpinmedicapplyDto dto1=new OutpinmedicapplyDto(); dto1.setHisRegistrationId(order.getCardId()); dto1.setSfzh(customer.getCusIdcard()); dto1.setSqysbm("00029"); dto1.setMzksbm("0101"); dto1.setSjrq(date); dto1.setCzybm("00029"); dto1.setCzyksbm("0101"); dto1.setCflxbm("A"); dto1.setYfbm("1"); dto1.setFyts("1"); dto1.setMzzd(""); dto1.setDetails(outpinmedicapplyDetilsDtos); AjaxResult result = controller.Outpinmedicapply(dto1); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if(null !=code && code.equals("0")){ JSONObject resultData = object.getJSONObject("ResultData"); // Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0); String cfh = resultData.getStr("cfh"); for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) { TjCf cf=new TjCf(); cf.setCardId(order.getCardId()); cf.setSfzh(customer.getCusIdcard()); cf.setCfh(cfh); cf.setSqysbm("00029"); cf.setSqysxm("王健萍"); cf.setMzksbn("0101"); cf.setSqrq(date); cf.setCzybm("00029"); cf.setYpbm(detilsDto.getYpbm()); cf.setYpmc("尿素[14C]呼气试验药盒"); cf.setSl(String.valueOf(detilsDto.getSl())); cf.setDj(String.valueOf(detilsDto.getDj())); cf.setDcjl(String.valueOf(detilsDto.getDcjl())); cf.setPj(String.valueOf(detilsDto.getPj())); cf.setJj(String.valueOf(detilsDto.getJj())); cf.setCreateTime(new Date()); cf.setJxbz(jxbz); cfService.save(cf); } } } //门诊治疗处置申请 if(!detailDtos.isEmpty()){ OutpintreatapplyDto dao = new OutpintreatapplyDto(); dao.setHisRegistrationId(order.getCardId()); dao.setSfzh(customer.getCusIdcard()); dao.setSqysbm("00029"); dao.setMzksbm("0101"); dao.setSjrq(date); dao.setCzybm("00029"); dao.setCzyksbm("0101"); dao.setSfjz("0"); dao.setDetails(detailDtos.stream().distinct().collect(Collectors.toList())); AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao); String mzylyzsq2 = getAjaxResult(mzylyzsq1); JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2); String code5 = mzylyzsq3.getStr("ResultCode"); if (code5.equals("0")) { List<OutpintestapplyDetailsDto> details1 = dao.getDetails(); for (OutpintestapplyDetailsDto detail : details1) { LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); tree.setSfjx("Y"); tree.setJxbz(jxbz); tree.setCardId(dao.getHisRegistrationId()); LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>(); wrapper4.eq(TjCustomer::getCardId, tree.getCardId()); TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4); tree.setPationid(tjCustomer.getPationId()); JSONObject resultData = mzylyzsq3.getJSONObject("ResultData"); tree.setSqdh(resultData.getStr("zlczh")); tree.setFyhj(resultData.getStr("fyhj")); String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("处置"); LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); wrapper.eq(TjProject::getProParentId,0); List<TjProject> list = projectService.list(wrapper); String tj_price = ""; for (TjProject project : list) { tj_price += project.getProPrice() + "、"; } tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1)); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm); else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm); List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1); if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) { String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm(); LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm); LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2); LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>(); wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3); tree.setXmfl(ejjfxmzd.getYjkmdm()); } tree.setCreateTime(dates); ltkjJianchajianyanTreeService.save(tree); } } }*/ } //父项耗材 // ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new)); // for (TjConsumables tjConsumables : collect) { // TjChargingStandard tjChargingStandard = new TjChargingStandard(); // tjChargingStandard.setTjNum(order.getTjNumber()); // tjChargingStandard.setConsumablesId(tjConsumables.getId()); // tjChargingStandard.setPrice(tjConsumables.getPrice()); // tjChargingStandard.setProName(tjConsumables.getMakings()); // tjChargingStandard.setConsumablesName(tjConsumables.getMakings()); // tjChargingStandard.setCompany(tjConsumables.getSpecifications()); // tjChargingStandard.setCreateBy(sysUser.getNickName()); // tjChargingStandard.setCreateTime(dates); // tjChargingStandard.setUpdateBy(sysUser.getNickName()); // tjChargingStandard.setUpdateTime(dates); // tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId())); // tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId())); // chargingStandardService.save(tjChargingStandard); // } return true; }
@@ -1120,9 +1120,6 @@ // } /** * 查询客户体检历史记录 * @@ -1470,16 +1467,16 @@ return AjaxResult.error("未查询到缴费记录"); } } String s = configService.selectConfigByKey("is_request_common_his_api"); if (null != s && s.equals("Y")) { LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId()); wrapper1.eq(TjFlowingWater::getPayStasus,0L); List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1); if (!list.isEmpty()){ return AjaxResult.error("存在未缴费项目"); } } // String s = configService.selectConfigByKey("is_request_common_his_api"); // if (null != s && s.equals("Y")) { // LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>(); // wrapper1.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId()); // wrapper1.eq(TjFlowingWater::getPayStasus, 0L); // List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1); // if (!list.isEmpty()) { // return AjaxResult.error("存在未缴费项目"); // } // } } }else { log.error("路泰科技--- "+DateUtil.date()+" 未对接his接口 "+" 体检号 "+tjOrder.getTjNumber()); @@ -1491,13 +1488,13 @@ List<Integer> split = new ArrayList<>(); // 存放转换后的integer类型结果 if("Y".equals(config)){ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles(); if(null !=roles && roles.size()>0){ if (null != roles && !roles.isEmpty()) { List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("前台")).collect(Collectors.toList()); if(list.size()>0){ if(null !=ksId && ksId==100){ ksId=999; } if(null !=byKey && !"".equals(byKey)){ if (!list.isEmpty()) { // if (null != ksId && ksId == 100) { // ksId = 999; // } if (null != byKey && !byKey.isEmpty()) { String[] arr = byKey.split(","); // 根据逗号进行切割 for (String s : arr) { int num = Integer.parseInt(s); // 将每个子字符串转换为integer类型 @@ -1514,54 +1511,28 @@ split.add(ksId); } //判断当前登陆的人是不是管理员。管理员可以看当前体检号下所有项目 // if (sysUser.getUserName().equals("10001")) { // QueryWrapper<TjOrderRemark> wqq = new QueryWrapper<>(); // wqq.eq("tj_number", tjNumber); // List<TjOrderRemark> listq = remarkService.list(wqq); // if (listq.size() == 0) { // LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>(); // if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) { // wq2.in(TjProject::getDeptId,split); // } // //判断该项目是否需要打印报告 // wq2.eq(TjProject::getNeedReport,"Y"); // List<TjProject> Deptlist = projectService.list(wq2); // List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList()); // if (Deptlist.isEmpty() || proIdList.isEmpty()) { // return AjaxResult.error("该科室下无项目！"); // } // for (TjOrderRemark tjOrderRemark : listq) { // TjProject tjProjectq = projectService.getById(tjOrderRemark.getProId()); // if (null != tjProjectq) { // tjOrderRemark.setProName(tjProjectq.getProName()); // } // } // return AjaxResult.success(listq); // } LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>(); if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) { wq2.in(TjProject::getDeptId,split); List<TjOrderRemark> list; if(null != sysUser && sysUser.getUserName().equals("10001")){ list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber); }else { list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split); } //判断该项目是否需要打印报告 wq2.eq(TjProject::getNeedReport,"Y"); List<TjProject> Deptlist = projectService.list(wq2); List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList()); if (Deptlist.isEmpty() || proIdList.isEmpty()) { if (null ==list || list.isEmpty()) { return AjaxResult.error("该科室下无项目！"); } LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>(); wqqq.eq(TjOrder::getTjNumber, tjNumber); TjOrder one = orderService.getOne(wqqq); if (null != one) { LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>(); wqq.eq(TjOrderDetail::getOrderId, one.getOrderId()); wqq.isNotNull(TjOrderDetail::getFlowingWaterId); wqq.in(TjOrderDetail::getProId, proIdList); wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId()); List<TjOrderDetail> detailList = detailService.list(wqq); if (detailList != null && detailList.size() > 0) { List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()); QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>(); wq.eq("tj_number", tjNumber); wq.in("pro_id", collect); wq.ne("type", 2); wq.ne("dept_id",241); wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId()); List<TjOrderRemark> list = remarkService.list(wq); if (list.size() == 0) { return AjaxResult.success("该科室下无项目！"); } for (TjOrderRemark tjOrderRemark : list) { TjProject tjProject = projectService.getById(tjOrderRemark.getProId()); @@ -1569,11 +1540,39 @@ tjOrderRemark.setProName(tjProject.getProName()); } } return AjaxResult.success(list); } return AjaxResult.success(); } return AjaxResult.error(); // LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>(); // wqq.eq(TjOrderDetail::getOrderId, one.getOrderId()); // wqq.isNotNull(TjOrderDetail::getFlowingWaterId); // wqq.in(TjOrderDetail::getProId, proIdList); // wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId()); // List<TjOrderDetail> detailList = detailService.list(wqq); // if (detailList != null && !detailList.isEmpty()) { // List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()); // QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>(); // wq.eq("tj_number", tjNumber); // wq.in("pro_id", collect); // wq.ne("type", 2); // wq.ne("dept_id",241); // wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId()); // List<TjOrderRemark> list = remarkService.list(wq); // if (list.isEmpty()) { // return AjaxResult.success("该科室下无项目！"); // } // for (TjOrderRemark tjOrderRemark : list) { // TjProject tjProject = projectService.getById(tjOrderRemark.getProId()); // if (null != tjProject) { // tjOrderRemark.setProName(tjProject.getProName()); // } // } // return AjaxResult.success(list); // } // return AjaxResult.success(); // } } @Transactional @@ -1591,6 +1590,7 @@ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber); tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds); detailService.update(tjOrderDetailLambdaUpdateWrapper); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); } /** @@ -1679,7 +1679,7 @@ LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>(); wq.eq(SysUser::getDeptId, dept.getDeptId()); List<SysUser> list = userService.list(wq); if (list.size() != 0) { if (!list.isEmpty()) { return AjaxResult.error("该科室下有工作人员，不能停用！"); } } @@ -1725,8 +1725,6 @@ } @GetMapping("/getAdviceByTjNumAndPro") @ApiOperation(value = "根据项目id和体检号获取建议") public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "父项目项目id") @RequestParam String proId, @@ -1744,7 +1742,6 @@ } return AjaxResult.success(list); } /** ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -637,6 +637,6 @@ @DeleteMapping("/{cusIds}") @ApiOperation(value = "删除客户") public AjaxResult remove(@PathVariable @ApiParam(value = "所删除客户的id") Long[] cusIds) { return toAjax(tjCustomerService.deleteTjCustomerByCusIds(cusIds)); return toAjax(tjCustomerService.removeByIds(Arrays.asList(cusIds))); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -323,24 +323,26 @@ return AjaxResult.success("该订单已付款 无须再付"); } if (tjFlowingWaterService.updateById(tjFlowingWater)) { LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>(); wq2.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId()); wq2.isNull(TjOrderDetail::getFlowingWaterId); // LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>(); // wq2.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId()); // wq2.isNull(TjOrderDetail::getFlowingWaterId); List<TjConsumables> list2 = new ArrayList<>(); for (TjOrderDetail tjOrderDetail : detailService.list(wq2)) { tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); detailService.updateById(tjOrderDetail); } // for (TjOrderDetail tjOrderDetail : detailService.list(wq2)) { // tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); // detailService.updateById(tjOrderDetail); // } detailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String.valueOf(order.getOrderId()),String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); LambdaQueryWrapper<TjOrderDetail> wq3 = new LambdaQueryWrapper<>(); wq3.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId()); wq3.isNotNull(TjOrderDetail::getFlowingWaterId); List<TjOrderDetail> detailList = detailService.list(wq3); if (null != detailList && detailList.size() > 0) { if (null != detailList && !detailList.isEmpty()) { LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>(); wqq.eq(TbTransition::getCusId, customer.getCusIdcard()); wqq.in(TbTransition::getProId, detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList())); List<TbTransition> tbTransitionList = transitionService.list(wqq); if (null != tbTransitionList && tbTransitionList.size() > 0) { if (null != tbTransitionList && !tbTransitionList.isEmpty()) { // extracted(order, list2, tbTransitionList); //异步添加收费明细 asyncService.collectFees(order, list2, tbTransitionList, sysUser, tjFlowingWater.getDiscount()); @@ -501,19 +503,19 @@ .or() .like(TjCustomer::getCusPhone, tjPhone); List<TjCustomer> customerList = customerService.list(wq0); if (null != customerList && customerList.size() > 0) { if (null != customerList && !customerList.isEmpty()) { for (TjCustomer customer : customerList) { LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjOrder::getUserId, customer.getCusId()); wq1.eq(TjOrder::getCheckStatus, 0); wq1.orderByDesc(TjOrder::getCreateTime); List<TjOrder> tjOrders = orderService.list(wq1); if (null != tjOrders && tjOrders.size() > 0) { if (null != tjOrders && !tjOrders.isEmpty()) { for (TjOrder order : tjOrders) { LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>(); wq2.eq(TjOrderDetail::getOrderId, order.getOrderId()); List<TjOrderDetail> detailList = detailService.list(wq2); if (null != detailList && detailList.size() > 0) { if (null != detailList && !detailList.isEmpty()) { TjCollectFeesVo tjRefundVo = new TjCollectFeesVo(); tjRefundVo.setTjCusId(String.valueOf(customer.getCusId())); tjRefundVo.setTjName(customer.getCusName()); @@ -540,39 +542,6 @@ } } } // TjOrder order = null; // if (null != tjOrders && tjOrders.size() > 0) { // order = tjOrders.get(0); // } // if (null == order) { // continue; // } // LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>(); // wq2.eq(TjOrderDetail::getOrderId, order.getOrderId()); // List<TjOrderDetail> detailList = detailService.list(wq2); // if (null != detailList && detailList.size() > 0) { // TjCollectFeesVo tjRefundVo = new TjCollectFeesVo(); // tjRefundVo.setTjCusId(String.valueOf(customer.getCusId())); // tjRefundVo.setTjName(customer.getCusName()); // tjRefundVo.setTjPhone(customer.getCusPhone()); // tjRefundVo.setSex(String.valueOf(customer.getCusSex())); // tjRefundVo.setIdCard(customer.getCusIdcard()); // if (null != order.getDictCompName()) // tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null); // if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType()); // LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>(); // wq.eq(TjFlowingWater::getOrderId, order.getOrderId()); // wq.eq(TjFlowingWater::getIsAddition, "N"); // wq.eq(TjFlowingWater::getPayStasus, 0); // TjFlowingWater one = tjFlowingWaterService.getOne(wq); //// if (null == one) { //// return AjaxResult.success("不可重复收费"); //// } // tjRefundVo.setTjFlowingWater(one); // tjRefundVo.setTjNumber(order.getTjNumber()); // tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId())); // tjCollectFeesVoList.add(tjRefundVo); // } } return AjaxResult.success(tjCollectFeesVoList); } @@ -584,13 +553,13 @@ wq1.likeLeft(TjOrder::getTjNumber, tjNum); // wq1.eq(TjOrder::getCheckStatus, 0); List<TjOrder> orderList = orderService.list(wq1); if (null != orderList && orderList.size() > 0) { if (null != orderList && !orderList.isEmpty()) { for (TjOrder order : orderList) { LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>(); wq2.eq(TjOrderDetail::getOrderId, order.getOrderId()); //wq2.isNull(TjOrderDetail::getFlowingWaterId); List<TjOrderDetail> detailList = detailService.list(wq2); if (null != detailList && detailList.size() > 0) { if (null != detailList && !detailList.isEmpty()) { TjCustomer customer = customerService.getById(order.getUserId()); if (null != customer) { TjCollectFeesVo tjRefundVo = new TjCollectFeesVo(); @@ -643,39 +612,9 @@ } String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId()); String s = tjFlowingWaterService.getDiscount(OrderId); if (null != tjProjectList && tjProjectList.size() > 0) { if (null != tjProjectList && !tjProjectList.isEmpty()) { for (TjProject project : tjProjectList) { if (project.getProParentId() == 0) { /* //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>(); // wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard()); // wqq1.eq(TbTransition::getParentProId, project.getProId()); // List<TbTransition> tbTransitionList = transitionService.list(wqq1); // BigDecimal bigDecimal = new BigDecimal("0.00"); // BigDecimal bigDecimal1 = new BigDecimal("0.00"); // for (TbTransition transition : tbTransitionList) { // bigDecimal = bigDecimal.add(transition.getNowPrice()); // bigDecimal1=bigDecimal1.add(transition.getOrdPrice()); // } // project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP)); // project.setProOrdPrice(bigDecimal1); BigDecimal decimal = transitionService.getTbTransitionPriceAndOrdPrice(customerService.getById(order.getUserId()).getCusIdcard(), project.getProId()); String s = tjFlowingWaterService.getDiscount(OrderId); if(null !=decimal){ // project.setProPrice(decimal.setScale(2)); project.setProPrice(decimal); // project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2)); project.setProOrdPrice(decimal); }else { BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId()); if(null !=decimal1){ project.setProPrice(decimal1.setScale(2)); project.setProOrdPrice(decimal1.multiply(new BigDecimal(s)).setScale(2)); }else { project.setProPrice(new BigDecimal("0.00").setScale(2)); project.setProOrdPrice(new BigDecimal("0.00").setScale(2)); } }*/ if (null != pacId) { TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId) .eq(TjPackageProject::getProId, String.valueOf(project.getProId()))); @@ -696,9 +635,9 @@ List<TjFlowingWater> list = tjFlowingWaterService.list(new LambdaQueryWrapper<TjFlowingWater>() .eq(TjFlowingWater::getOrderId, order) .eq(TjFlowingWater::getPayStasus, 2)); if (null != list && list.size() > 0) { if (null != list && !list.isEmpty()) { List<TjProject> projectList = projectService.getTjProListByPacIdAndDeptId(pacId); if(null !=projectList && projectList.size()>0){ if(null !=projectList && !projectList.isEmpty()){ for (TjProject project : projectList) { project.setProOrdPrice(tjPackageProjectService.getPacProPriceByPacIdAndPro(project.getProId(),pacId) .multiply(new BigDecimal(s)).setScale(2)); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1233,7 +1233,6 @@ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); String s = configService.selectConfigByKey("is_request_common_his_api"); if (null != s && s.equals("Y")) { String apiUrl = configService.selectConfigByKey("common_api_url"); @@ -1290,7 +1289,7 @@ JSONObject data = object.getJSONObject("data"); tjFlowingWater.setHisWaterId(data.getStr("feiYongId")); JSONArray mxList = data.getJSONArray("mxList"); if (mxList != null && mxList.size() > 0) { if (mxList != null && !mxList.isEmpty()) { List<TjFlowingWaterHis> his = mxList.toList(TjFlowingWaterHis.class); tjFlowingWaterHisService.saveBatch(his); } @@ -1310,7 +1309,7 @@ // if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult; tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); @@ -2586,6 +2585,7 @@ if (null != tjReservation && tjReservation.getPayType() == 1) { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); } } if (tjFlowingWater.getPayStasus() == 1L) { @@ -2595,6 +2595,7 @@ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith()); tjFlowingWater.setPayType(4L); tjFlowingWaterService.updateById(tjFlowingWater); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); // asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser); } } @@ -2657,11 +2658,13 @@ if (null != tjReservation && tjReservation.getPayType() == 1) { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); } } if (tjFlowingWater.getPayStasus() == 1) { tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString()); } if (tjFlowingWater.getDiscount() == null) { transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber()); @@ -2926,6 +2929,7 @@ ArrayList<TjFlowingWater> yizhifu = new ArrayList<>(); LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(TjFlowingWater::getOrderId, order.getOrderId()); wrapper1.orderByDesc(TjFlowingWater::getJxbz); List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1); LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TjCustomer::getCusId,order.getUserId()); @@ -3045,7 +3049,7 @@ remarkService.deletedOrderRemarkByTjNum(order.getTjNumber()); tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId())); transitionService.deletedTbTransitionByTjNum(order.getTjNumber()); transitionService.updateTbTransitionByTjNum(order.getTjNumber()); // transitionService.updateTbTransitionByTjNum(order.getTjNumber()); } } for (String id : reservationIds) { @@ -3158,7 +3162,7 @@ @GetMapping("/revokeTjOrderByTjh") @ApiOperation(value = "根据就体检号删除记录") @ApiOperation(value = "强制撤销接口根据就体检号删除记录") @Transactional public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "体检号") String tjNum) { @@ -3168,11 +3172,13 @@ // if (null != payByTjNum) { // return AjaxResult.error("该用户已收费不可撤销签到!"); // } //这里删除的是这个人所有项目包括补录项目 tjOrderService.deleteTjOrderByOrderId(order.getOrderId()); tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId())); remarkService.deletedOrderRemarkByTjNum(tjNum); tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId())); transitionService.deletedTbTransitionByTjNum(tjNum); tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId()); } return AjaxResult.success(); } @@ -3217,7 +3223,7 @@ // @Transactional public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) { if (null == dto.getBldhs() || dto.getBldhs().size() == 0) { if (null == dto.getBldhs() || dto.getBldhs().isEmpty()) { log.info("请选择要撤销的补录项目"); return AjaxResult.error("请选择要撤销的补录项目"); } @@ -3309,7 +3315,7 @@ map.put("cardId", tjCustomer.getHisJzkh()); map.put("tjNum", water.getTjSerialNumber()); map.put("kaiDanKs","7805"); // 收费标志 1待售费 2待退费 // 收费标志 1待收费 2待退费 map.put("shouTuiStatus","2"); JSONArray array = JSONUtil.createArray(); String bldh = water.getJxbz(); @@ -3400,12 +3406,23 @@ if (isDelete) { for (TjFlowingWater water : weizhifu) { String bldh = water.getJxbz(); if(StrUtil.isNotBlank(bldh)){ remarkService.deleteTjOrderDetailByjxbz(bldh); tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh); tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh); transitionService.deleteTjOrderDetailByjxbz(bldh); blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh)); tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh); }else { //这里删除的是这个人所有项目包括补录项目 tjOrderService.deleteTjOrderByOrderId(order.getOrderId()); tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId())); remarkService.deletedOrderRemarkByTjNum(tjNum); tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId())); transitionService.deletedTbTransitionByTjNum(tjNum); tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId()); } } } } else return AjaxResult.error(); ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
@@ -121,6 +121,10 @@ private String jxbz; @ApiModelProperty(value = "收费标志") private String sfbz; @ApiModelProperty(value = "项目类别") @TableField(exist = false) private String xmlb; ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -254,4 +254,17 @@ @Select("call tj_check_yclist(4,#{tjNumber,mode=IN})") List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu4(@Param("tjNumber") String tjNumber); @Update("UPDATE tj_order_detail a SET\n" + "a.flowing_water_id=#{ls} ,\n" + "a.update_time=SYSDATE()\n" + "WHERE a.order_id=#{orderId} and a.jxbz=#{jxbz}") void updateTjOrderDetailsFlowingWaterIdByJxbz(@Param("orderId") String orderId, @Param("jxbz")String jxbz,@Param("ls")String ls); @Update("UPDATE tj_order_detail a SET\n" + "a.flowing_water_id=#{ls} ,\n" + "a.update_time=SYSDATE()\n" + "WHERE a.order_id=#{orderId} and isnull(a.jxbz)") void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(@Param("orderId") String orderId,@Param("ls")String ls); } ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -194,4 +194,34 @@ @Select("SELECT COUNT(*) a FROM tj_order_remark a WHERE a.deleted=0 AND a.tj_number=#{tjNum} AND a.type in(0,3);") int panduaniswancheng(String tjNum); @Update("\n" + "UPDATE tj_order_remark a JOIN tj_order b ON b.tj_number=a.tj_number\n" + "SET\n" + " a.sfbz=#{ls}\n" + "WHERE b.order_id=#{orderId} AND a.jxbz=#{jxbz}") void updateTjOrderRemarkSfbzByJxbz(@Param("orderId") String orderId,@Param("jxbz") String jxbz,@Param("ls") String ls); @Update("\n" + "UPDATE tj_order_remark a JOIN tj_order b ON b.tj_number=a.tj_number\n" + "SET\n" + " a.sfbz=#{ls}\n" + "WHERE b.order_id=#{orderId} AND ISNULL(a.jxbz)") void updateTjOrderRemarkSfbzByJxbzisnull(@Param("orderId") String orderId,@Param("ls") String ls); @Select({"<script>", "SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id ", " WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ", "<foreach collection='split' item='id' open='(' separator=',' close=')'>", "#{id}", "</foreach>", "</script>" }) List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") List<Integer> split); @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" + "\n" + "WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n") List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -125,4 +125,8 @@ List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber); List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(int num,String tjNumber); void updateTjOrderDetailsFlowingWaterIdByJxbz(String orderId, String jxbz,String ls); void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String orderId,String ls); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -78,4 +78,12 @@ int panduaniscunzaiweijian(String tjNum); int panduaniswancheng(String tjNum); void updateTjOrderRemarkSfbzByJxbz(String orderId, String jxbz, String ls); void updateTjOrderRemarkSfbzByJxbzisnull(String orderId, String ls); List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber,List<Integer> split); List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(String tjNumber); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -207,8 +207,21 @@ return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber); } @Override public List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber) { return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber); } @Override public void updateTjOrderDetailsFlowingWaterIdByJxbz(String orderId, String jxbz,String ls) { tjOrderDetailMapper.updateTjOrderDetailsFlowingWaterIdByJxbz(orderId,jxbz,ls); } @Override public void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String orderId,String ls) { tjOrderDetailMapper.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(orderId,ls); } } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -156,4 +156,24 @@ return mapper.panduaniswancheng(tjNum); } @Override public void updateTjOrderRemarkSfbzByJxbz(String orderId, String jxbz, String ls) { mapper.updateTjOrderRemarkSfbzByJxbz(orderId,jxbz,ls); } @Override public void updateTjOrderRemarkSfbzByJxbzisnull(String orderId, String ls) { mapper.updateTjOrderRemarkSfbzByJxbzisnull(orderId,ls); } @Override public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, List<Integer> split) { return mapper.yiShengJianChaGetPrentPro(tjNumber,split); } @Override public List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(String tjNumber) { return mapper.yiShengJianChaGetPrentProCJGLY(tjNumber); } }
