ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -168,6 +168,10 @@ //体检对his申请单调用方法 public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) { List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); //检验申请 OutpintestapplyDto dto = new OutpintestapplyDto(); dto.setHisRegistrationId(cardId); @@ -178,7 +182,7 @@ dto.setCzybm("00029"); dto.setCzyksbm("0101"); dto.setSfjz("0"); List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>(); if (null != detailList && detailList.size() > 0) { @@ -250,23 +254,6 @@ String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("检验"); // LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); // 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<TjProject> wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); // wrapper.eq(TjProject::getSl,1); // wrapper.groupBy(TjProject::getHisXmbm); // TjProject project = projectService.getOne(wrapper); // if(null !=project){ // BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl())); // tree.setTjPrice(String.valueOf(decimal)); // } tree.setTjPrice(String.valueOf(detail.getProjg())); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) @@ -298,13 +285,11 @@ outpinexamapplyDto.setCzybm("00029"); outpinexamapplyDto.setCzyksbm("0101"); outpinexamapplyDto.setSfjz("0"); List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); // List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>(); if (null != detailLists && detailLists.size() > 0) { if (null != detailList && detailList.size() > 0) { LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); wq.in(TjProject::getProId, detailLists.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); // wq.groupBy(TjProject::getHisXmbm); // wq.in(TjProject::getDeptId, "247", "248", "249", "250", "251", "252", "271", "273", "274", "275", "298"); wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); wq.in(TjProject::getDeptId,deptService.getJcDeptIds()); List<TjProject> projects = projectService.list(wq); if (null != projects && projects.size() > 0) { @@ -369,23 +354,6 @@ String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("检查"); // LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); // 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<TjProject> wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); // wrapper.eq(TjProject::getSl,1); // wrapper.groupBy(TjProject::getHisXmbm); // TjProject project = projectService.getOne(wrapper); // if(null !=project){ // BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl())); // tree.setTjPrice(String.valueOf(decimal)); // } tree.setTjPrice(String.valueOf(detail.getProjg())); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) @@ -405,18 +373,7 @@ tree.setCreateTime(DateUtil.date()); ltkjJianchajianyanTreeService.save(tree); } // Map<String, Object> map = object5.getJSONObject("ResultData"); // map.put("cardId", customer.getCardId()); // JSONObject jsonObject = JSONUtil.parseObj(map); // LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>(); // lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinexamapply"); // HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper); // hisApiGetMethodService.save(jsonObject, "Outpinexamapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinexamapplyDto))); } // else { // return AjaxResult.error("检查申请失败!"); // } } @@ -430,15 +387,12 @@ dao.setCzybm("00029"); dao.setCzyksbm("0101"); dao.setSfjz("0"); List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); // List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId); List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>(); if (null != details && details.size() > 0) { if (null != detailList && detailList.size() > 0) { LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); // wq.groupBy(TjProject::getHisXmbm); // wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270"); wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); wq.in(TjProject::getDeptId,deptService.getCzDeptIds()); // wq.isNull(TjProject::getDeptId); List<TjProject> projects = projectService.list(wq); if (null != projects && projects.size() > 0) { for (TjProject project : projects) { @@ -502,15 +456,6 @@ String mxfyxmbm = detail.getMxfyxmbm(); tree.setHisXmdm(mxfyxmbm); tree.setType("处置"); // LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(TjProject::getHisXmbm, mxfyxmbm); // wrapper.eq(TjProject::getSl,1); // wrapper.groupBy(TjProject::getHisXmbm); // TjProject project = projectService.getOne(wrapper); // if(null !=project){ // BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl())); // tree.setTjPrice(String.valueOf(decimal)); // } tree.setTjPrice(String.valueOf(detail.getProjg())); LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>(); if (detail.getSfzhfy().equals("1")) @@ -530,17 +475,7 @@ tree.setCreateTime(DateUtil.date()); ltkjJianchajianyanTreeService.save(tree); } // Map<String, Object> map = mzylyzsq3.getJSONObject("ResultData"); // map.put("cardId", customer.getCardId()); // JSONObject jsonObject = JSONUtil.parseObj(map); // LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>(); // lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintreatapply"); // HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper); // hisApiGetMethodService.save(jsonObject, "Outpintreatapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dao))); } // else { // return AjaxResult.error("处置申请失败!"); // } } //药品申请 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -503,7 +503,7 @@ @Override @Async("async") @Transactional // @Transactional public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) { Date dates = new Date(); final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss"); @@ -522,7 +522,6 @@ proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn())); blService.save(proBl); List<TjConsumables> list2 = new ArrayList<>(); String[] tjProIds = tjFlowingWater.getTjProIds(); String config = configService.selectConfigByKey("sfkqdyhis"); @@ -542,8 +541,9 @@ List<TjProject> projectList=new ArrayList<>(); for (String tjProId : tjProIds) { LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>(); wqq.eq(TbTransition::getCusId, customer.getCusIdcard()); // LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>(); // wqq.eq(TbTransition::getCusId, customer.getCusIdcard()); // wqq.isNull(TbTransition::getTjNum); TjProject project = projectService.getById(Long.valueOf(tjProId)); if (null != project && project.getProParentId() == 0) { TjOrderRemark tjOrderRemark = new TjOrderRemark(); @@ -591,7 +591,7 @@ detail1.setJxbz(jxbz); tjOrderDetailService.save(detail1); } wqq.in(TbTransition::getProId, proIds); // wqq.in(TbTransition::getProId, proIds); if(null !=config && config.equals("Y")){ //检验 @@ -729,7 +729,7 @@ } else { wqq.in(TbTransition::getProId, Arrays.asList(tjProIds)); // wqq.in(TbTransition::getProId, Arrays.asList(tjProIds)); TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId)); if (null != projects) { TjProject projectss = projectService.getById(projects.getProParentId()); @@ -737,11 +737,9 @@ projectList.add(projectss); } } // List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList()); TjOrderDetail detail = new TjOrderDetail(); detail.setTjStatus(0L); detail.setOrderId(tjFlowingWater.getOrderId()); // detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); detail.setProId(Long.valueOf(tjProId)); detail.setIsAddition("Y"); detail.setCreateBy(sysUser.getNickName()); @@ -755,64 +753,23 @@ } List<TbTransition> tbTransitionList = transitionService.list(wqq); if (null != tbTransitionList && tbTransitionList.size() > 0) { // List<TbTransition> tbTransitionList = transitionService.list(wqq); List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(),tjProId); if (null != tbTransitionList && !tbTransitionList.isEmpty()) { for (TbTransition transition : tbTransitionList) { transition.setJxbz(jxbz); transition.setTjNum(order.getTjNumber()); transition.setCardId(order.getCardId()); transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10)))); transitionService.updateById(transition); // TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId()); //子项 // if (null != tjProject) { // TjChargingStandard tjChargingStandard = new TjChargingStandard(); // tjChargingStandard.setTjNum(order.getTjNumber()); // tjChargingStandard.setProId(transition.getProId()); // tjChargingStandard.setPrice(transition.getNowPrice()); // tjChargingStandard.setProName(tjProject.getProName()); // 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); // } // transition.setJxbz(jxbz); // transition.setTjNum(order.getTjNumber()); // transition.setCardId(order.getCardId()); // transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10)))); // transitionService.updateById(transition); transitionService.updateTbTransitionById(transition.getId().toString(),jxbz,order.getTjNumber(),order.getCardId(), transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10)))); } //父项 // // TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId)); // if (null != parentProject && parentProject.getProParentId() == 0) { // LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>(); // wqqq.eq(TjProConsumables::getProId, parentProject.getProId()); // List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq); // if (null != proConsumables && proConsumables.size() > 0) { // for (TjProConsumables tjProConsumables : proConsumables) { // TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()); // list2.add(tjConsumables); // } // } // // } else { // TjProject parentProjects = projectService.getById(tjProId); // if (null != parentProjects) { // LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>(); // wqqq.eq(TjProConsumables::getProId, parentProjects.getProId()); // List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq); // if (null != proConsumables && proConsumables.size() > 0) { // for (TjProConsumables tjProConsumables : proConsumables) { // TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId()); // list2.add(tjConsumables); // } // } // } // } } } if(projectList.size()>0){ if(!projectList.isEmpty()){ List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList()); for (TjProject project : list) { TjOrderRemark tjOrderRemark = new TjOrderRemark(); @@ -832,7 +789,6 @@ TjOrderDetail detail1 = new TjOrderDetail(); detail1.setTjStatus(0L); detail1.setOrderId(tjFlowingWater.getOrderId()); // detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); detail1.setProId(project.getProId()); detail1.setIsAddition("Y"); detail1.setCreateBy(sysUser.getNickName()); @@ -982,10 +938,8 @@ if(null !=config && config.equals("Y")){ //检验申请 if(detailsDtos.size()>0){ if(!detailsDtos.isEmpty()){ OutpintestapplyDto dto = new OutpintestapplyDto(); dto.setHisRegistrationId(order.getCardId()); dto.setSfzh(customer.getCusIdcard()); @@ -1048,7 +1002,7 @@ } //门诊检查申请 if(detailsDtoss.size()>0){ if(!detailsDtoss.isEmpty()){ OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); outpinexamapplyDto.setHisRegistrationId(order.getCardId()); outpinexamapplyDto.setSfzh(customer.getCusIdcard()); @@ -1109,7 +1063,7 @@ } //药品申请 if(outpinmedicapplyDetilsDtos.size()>0){ if(!outpinmedicapplyDetilsDtos.isEmpty()){ OutpinmedicapplyDto dto1=new OutpinmedicapplyDto(); dto1.setHisRegistrationId(order.getCardId()); dto1.setSfzh(customer.getCusIdcard()); @@ -1157,7 +1111,7 @@ } //门诊治疗处置申请 if(detailDtos.size()>0){ if(!detailDtos.isEmpty()){ OutpintreatapplyDto dao = new OutpintreatapplyDto(); dao.setHisRegistrationId(order.getCardId()); dao.setSfzh(customer.getCusIdcard()); @@ -1218,7 +1172,6 @@ } } } //父项耗材 // ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new)); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -516,7 +516,7 @@ LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>(); wqq.like(TjCustomer::getCusName, name); List<TjCustomer> customerList = tjCustomerService.list(wqq); if (null != customerList && customerList.size() > 0) { if (null != customerList && !customerList.isEmpty()) { List<TjOrder> list = new ArrayList<>(); for (TjCustomer customer : customerList) { LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>(); @@ -526,7 +526,7 @@ list.addAll(tjOrderService.list(wq)); } List<TjOrder> collect = null; if (list.size() > 0) { if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId()); @@ -536,7 +536,7 @@ } list.get(i).setTjCustomerSex(tjCustomer.getCusSex()); list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); list.get(i).setTjCustomerName(tjCustomer.getCusName()); list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); @@ -597,7 +597,7 @@ } list.get(i).setTjCustomerSex(tjCustomer.getCusSex()); list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); list.get(i).setTjCustomerName(tjCustomer.getCusName()); list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); if (tjCustomer.getCusIdcard() != null) { list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); @@ -1554,143 +1554,32 @@ redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId); } } // List<TbTransition> tbTransitionList = null; // if (!redisCache.hasKey(cardId + cusId)) { // tbTransitionList = new ArrayList<>(); // } else { // tbTransitionList = redisCache.getCacheList(cardId + cusId); // } //套餐 /*套餐*/ if (null != packId && !packId.equals("")) { Long pacId = Long.valueOf(packId.toString()); List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId)); if (null == list || list.size() == 0) { if (null == list || list.isEmpty()) { transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId); // if (redisCache.hasKey(cardId + cusId + "cusId")) // redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId); // if (redisCache.hasKey(cardId + cusId)) { // tbTransitionList = new ArrayList<>(); // redisCache.deleteObject(cardId + cusId); // } List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId)); if (null != ppList && ppList.size() > 0) { if (null != ppList && !ppList.isEmpty()) { transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId); //异步保存数据库 // asyncService.addRedisTransitionPac(cusId, pacId, ppList); // asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null); // for (TjPackageProject tjPackageProject : ppList) { // TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId())); // if (null != project) { // // BigDecimal divide = BigDecimal.valueOf(0); // if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) { // divide = BigDecimal.valueOf(0); // } else { // divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN); // } // List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); // if (null != tjProSonList && tjProSonList.size() > 0) { // //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList); // for (TjProject tjProject : tjProSonList) { // TbTransition tbTransition = new TbTransition(); // tbTransition.setCusId(cusId); // tbTransition.setPacId(pacId); // if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) { // tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN)); // tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN)); // } else { // tbTransition.setNowPrice(BigDecimal.valueOf(0.00)); // tbTransition.setOrdPrice(BigDecimal.valueOf(0.00)); // } // tbTransition.setParentProId(project.getProId()); // tbTransition.setParentProName(project.getProName()); // tbTransition.setProId(tjProject.getProId()); // tbTransition.setProName(tjProject.getProName()); // tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName()); // tbTransition.setProType(tjProject.getProType()); // tbTransition.setProCheckMethod(tjProject.getProCheckMethod()); // tbTransitionList.add(tbTransition); // } // // } // } // } } } } //单项 if (null != proIds && proIds.size() > 0) { if (null != proIds && !proIds.isEmpty()) { //异步保存数据库表 // asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds); for (Long proId : proIds) { TjProject project = projectService.selectTjProjectByProId(proId); if (null != project) { //&& (!project.getProName().contains("静脉采血")|| !project.getProName().contains("费")) if (null != project) { List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); if (null == transitionList || transitionList.size() == 0) { if (null == transitionList || transitionList.isEmpty()) { transitionService.saveRedisTransitionByProId(cusId, cardId, proId); } } // if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId); } // for (Long proId : proIds) { // List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); // 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())); //// if (null != tjProSonList && tjProSonList.size() > 0) { //// for (TjProject tjProject : tjProSonList) { //// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId())); //// if (null != transitionss && transitionss.size() > 0) { //// continue; //// } // TbTransition tbTransition = new TbTransition(); // tbTransition.setCusId(cusId); // tbTransition.setPacId(null); // if (null != tjProject.getProPrice()) { // tbTransition.setOrdPrice(tjProject.getProPrice()); // tbTransition.setNowPrice(tjProject.getProPrice()); // } else { // tbTransition.setOrdPrice(BigDecimal.valueOf(0.00)); // tbTransition.setNowPrice(BigDecimal.valueOf(0.00)); // } // tbTransition.setParentProId(tjProject.getProParentId()); // if (tjProject.getProParentId() != null) { // TjProject byId = projectService.getById(tjProject.getProParentId()); // if (null != byId) { // tbTransition.setParentProName(byId.getProName()); // } // } // tbTransition.setParentProName(""); // // tbTransition.setProId(tjProject.getProId()); // tbTransition.setProName(tjProject.getProName()); // tbTransition.setProType(tjProject.getProType()); // tbTransition.setProCheckMethod(tjProject.getProCheckMethod()); // tbTransitionList.add(tbTransition); //// } //// } // } // } } // if (null != tbTransitionList && tbTransitionList.size() > 0) { // if (redisCache.hasKey(cardId + cusId)) { // redisCache.deleteObject(cardId + cusId); // redisCache.setCacheList(cardId + cusId, tbTransitionList); // redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId)); // } else { // redisCache.setCacheList(cardId + cusId, tbTransitionList); // redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId)); // } // List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList); // return AjaxResult.success(); // } return AjaxResult.success(); }
@@ -316,33 +316,35 @@ TjOrder tjOrder = tjOrderService.getOne(queryWrapper); if (null != tjOrder) { LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>(); TjReportTemplate reportTemplate = null; if (tjOrder.getTjCategory() != null) { //查询字典 LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>(); wqq.eq(SysDictData::getDictType, "dict_tjtype"); wqq.eq(SysDictData::getDictValue, tjOrder.getTjCategory()); SysDictData one = dictDataService.getOne(wqq); if (one != null) { //查询字典 LambdaQueryWrapper<SysDictData> wqq1 = new LambdaQueryWrapper<>(); wqq1.eq(SysDictData::getDictType, "report_template_type"); wqq1.eq(SysDictData::getDictLabel, one.getDictLabel()); SysDictData one1 = dictDataService.getOne(wqq1); if (one1 != null) { tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, one1.getDictValue()); } else { tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1); } } else { tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1); } tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0); reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper); } else { tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0); reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2); } TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper); // if (tjOrder.getTjCategory() != null) { // //查询字典 // LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>(); // wqq.eq(SysDictData::getDictType, "dict_tjtype"); // wqq.eq(SysDictData::getDictValue, tjOrder.getTjCategory()); // SysDictData one = dictDataService.getOne(wqq); // if (one != null) { // //查询字典 // LambdaQueryWrapper<SysDictData> wqq1 = new LambdaQueryWrapper<>(); // wqq1.eq(SysDictData::getDictType, "report_template_type"); // wqq1.eq(SysDictData::getDictLabel, one.getDictLabel()); // SysDictData one1 = dictDataService.getOne(wqq1); // if (one1 != null) { // tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, one1.getDictValue()); // } else { // tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1); // } // } else { // tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1); // } // tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0); // reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper); // } else { // tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0); // reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2); // } Integer checkStatus = tjOrder.getCheckStatus(); if (checkStatus == 1) { if ("报表".equals(reportTemplate.getPrint())) { @@ -1492,7 +1494,7 @@ } } printReport.put(entry.getKey(), tjPdfVOS); if (tjPdfVOS.size() == 0) { if (tjPdfVOS.isEmpty()) { toRemoveKeys.add(entry.getKey()); } } @@ -1597,7 +1599,7 @@ LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>(); wq6.eq(TjStandard::getProId, tjOrderDetail.getProId()); List<TjStandard> list2 = tjStandardService.list(wq6); if (list2.size() == 0) { if (list2.isEmpty()) { TjStandard s = new TjStandard(); s.setCompany(" "); s.setTjStandardLtValue(" "); ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -80,7 +80,7 @@ " WHERE a.tj_num=#{tjNum}") boolean updateTbTransitionByTjNum(String tjNum); @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId}") @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} AND pac_id=#{pacId} and isnull(tj_num)") public List<TbTransition> getTbTransitionListByCusIdAndPac(@Param("cusId") String cusId,@Param("pacId") String pacId); @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} and card_id=#{cardId}") @@ -117,6 +117,15 @@ boolean updateTbTransitionPriceByCusId(@Param("cusId")String cusId,@Param("discount")BigDecimal discount,@Param("tjNum")String tjNum); @Update("UPDATE tb_transition a SET \n" + " a.now_price=#{jg},\n" + " a.tj_num=#{tjNum},\n" + " a.card_id=#{cardId},\n" + " a.jxbz=#{jxbz}\n" + " WHERE a.id=#{id}") public boolean updateTbTransitionById(@Param("id")String id,@Param("jxbz")String jxbz,@Param("tjNum")String tjNum,@Param("cardId")String cardId,@Param("jg")BigDecimal jg); @Insert("INSERT INTO tb_transition(\n" + " cus_id,\n" + " pac_id,\n" + ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -106,6 +106,9 @@ public boolean updateTbTransitionPriceByCusId(String cusId,BigDecimal discount,String tjNum); public boolean updateTbTransitionById(String id,String jxbz,String tjNum,String cardId,BigDecimal jg); void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId); void saveRedisTransitionByProId(String cusId,String cardId, Long proId); ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -156,6 +156,11 @@ return tbTransitionMapper.updateTbTransitionPriceByCusId(cusId,discount,tjNum); } @Override public boolean updateTbTransitionById(String id,String jxbz,String tjNum,String cardId,BigDecimal jg) { return tbTransitionMapper.updateTbTransitionById(id,jxbz,tjNum,cardId,jg); } @Override public void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId) {
