From dedacd79c93f8ef95e0cb986f5e7fbd27ddbd907 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期四, 03 七月 2025 09:12:49 +0800 Subject: [PATCH] 2025-07-03 --- ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java | 390 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 270 insertions(+), 120 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java index 4a5c5ca..58b31bf 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java @@ -2,7 +2,6 @@ import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import cn.hutool.json.JSONObject; @@ -11,12 +10,14 @@ import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.common.utils.AgeResult; import com.ltkj.common.utils.DateUtils; -import com.ltkj.common.utils.IdUtils; +import com.ltkj.hosp.idutil.IdUtils; import com.ltkj.hosp.domain.*; import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto; import com.ltkj.hosp.lisDto.LisSaveSqdxxDto; import com.ltkj.hosp.lisDto.LisSaveSqdxxJyxmlistDto; +import com.ltkj.hosp.mapper.TbTransitionMapper; import com.ltkj.hosp.service.*; +import com.ltkj.system.service.ISysConfigService; import com.ltkj.system.service.ISysDeptService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.DateFormatUtils; @@ -24,10 +25,7 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -58,126 +56,251 @@ private LtkjJyxmzdService jyxmzdService; @Autowired private IdUtils idUtils; + @Autowired + private ISysConfigService configService; + @Autowired + private ITjOrderService orderService; + @Autowired + private ITjCustomerService customerService; + @Autowired + private TbTransitionMapper tbTransitionMapper; + @Autowired + private ITjSamplingService tjSamplingService; - /** - * 淇濆瓨妫�楠屽崟鐢宠淇℃伅 - * @param tjOrder - * @param tjCustomer - * @param detailList - * @return - */ - public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TbTransition> detailList){ - if (detailList != null && !detailList.isEmpty()) { - LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); - wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); - wq.in(TjProject::getDeptId,deptService.getJyDeptIds()); - List<TjProject> projects = projectService.list(wq); - if (projects != null && !projects.isEmpty()){ - // 鏍规嵁project琛ㄧ殑his_xmbm鏌ョ粍鍚堝叧鑱旇〃 ltkj_jfzhgljyxmzd 鏍规嵁瀛楁`zhxmdm` - // - 鏌ュ埌 浣跨敤瀛楁`jyxmdm`鏌ユ楠岄」鐩瓧鍏歌〃 ltkj_jyxmzd 鏍规嵁瀛楁`jyxmdm` - // - 鏈煡鍒� 鏌ラ」鐩叧鑱旇〃ltkj_jfxmgljyxmzd 鏍规嵁瀛楁`xmdm` - AtomicInteger xh = new AtomicInteger(); - for (TjProject project : projects) { - if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) { - if (null != project.getHisXmbm()) { - LtkjJyxmzd jyxmzd = getJyxmzd(project); - if (jyxmzd != null) { - LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto(); - String jyxh = idUtils.generateLisID(); - lisSaveSqdxxDto.setJyxh(jyxh); - lisSaveSqdxxDto.setBah(tjOrder.getCardId()); - lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName()); - lisSaveSqdxxDto.setBrdm(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),"")); - lisSaveSqdxxDto.setXb(tjCustomer.getCusSex()==1?"2":"1"); - lisSaveSqdxxDto.setCsrq(DateFormatUtils.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd")); - AgeResult ageResult = DateUtils.calculateAge(tjCustomer.getCusBrithday()); - lisSaveSqdxxDto.setNl(String.valueOf(ageResult.getAge())); - lisSaveSqdxxDto.setNldw(String.valueOf(ageResult.getUnit())); - lisSaveSqdxxDto.setSfzh(tjCustomer.getCusIdcard()); - lisSaveSqdxxDto.setLxdh(tjCustomer.getCusPhone()); - lisSaveSqdxxDto.setJtzz(""); - Date date = new Date(); - lisSaveSqdxxDto.setSqrq(DateFormatUtils.format(date, "yyyy-MM-dd HH:mm:ss")); - lisSaveSqdxxDto.setCyrq(""); - lisSaveSqdxxDto.setLczd(""); - lisSaveSqdxxDto.setBz(""); - lisSaveSqdxxDto.setKsbm("0101"); - lisSaveSqdxxDto.setSqys("00029"); - lisSaveSqdxxDto.setKfbz("1"); - List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); - ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>(); - BigDecimal allPrice = new BigDecimal("0"); - for (TbTransition transition : detailList.stream().filter(item -> Objects.equals(item.getParentProId(), project.getProId())) - .collect(Collectors.toList())) { - allPrice = allPrice.add(transition.getNowPrice()); - } - lisSaveSqdxxDto.setFyje(allPrice.toString()); - lisSaveSqdxxDto.setYbbm(jyxmzd.getJybbdm()); - LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto(); - dto.setXh(String.valueOf(xh.getAndIncrement() + 1)); - dto.setJyxm(jyxmzd.getJyxmdm()); - dto.setXmmc(jyxmzd.getJyxmmc()); - dtos.add(dto); - OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); - detailsDto.setMxfyxmbm(project.getHisXmbm()); - if (project.getSfzhfy().equals("Y")) { - detailsDto.setSfzhfy("1"); - } else { - detailsDto.setSfzhfy("0"); - } - detailsDto.setSl(project.getSl()); - detailsDto.setProjg(project.getProPrice()); - detailsDtos.add(detailsDto); + public Boolean save(TjSampling sampling,TjOrder tjOrder,TjCustomer tjCustomer){ + String dept = configService.selectConfigByKey("request_default_dept"); + String ysbm = configService.selectConfigByKey("request_default_ysbm"); + AtomicInteger xh = new AtomicInteger(); + LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto(); +// String jyxh = idUtils.generateLisID(); + lisSaveSqdxxDto.setJyxh(sampling.getJyxh()); + lisSaveSqdxxDto.setBah(tjOrder.getCardId()); + lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName()); + lisSaveSqdxxDto.setBrdm(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "")); + lisSaveSqdxxDto.setXb(tjCustomer.getCusSex() == 1 ? "2" : "1"); + lisSaveSqdxxDto.setCsrq(DateFormatUtils.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd")); + AgeResult ageResult = DateUtils.calculateAge(tjCustomer.getCusBrithday()); + lisSaveSqdxxDto.setNl(String.valueOf(ageResult.getAge())); + lisSaveSqdxxDto.setNldw(String.valueOf(ageResult.getUnit())); + lisSaveSqdxxDto.setSfzh(tjCustomer.getCusIdcard()); + lisSaveSqdxxDto.setLxdh(tjCustomer.getCusPhone()); + lisSaveSqdxxDto.setJtzz(""); + Date date = new Date(); + lisSaveSqdxxDto.setSqrq(DateFormatUtils.format(date, "yyyy-MM-dd HH:mm:ss")); + lisSaveSqdxxDto.setCyrq(""); + lisSaveSqdxxDto.setLczd(""); + lisSaveSqdxxDto.setBz(""); + lisSaveSqdxxDto.setKsbm(dept); + lisSaveSqdxxDto.setSqys(ysbm); + lisSaveSqdxxDto.setKfbz("1"); + List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); + ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>(); + BigDecimal allPrice; + if (sampling.getProId().contains(",")){ + allPrice = tbTransitionMapper.getLisPriceByTjNumAndInParentProId(tjOrder.getTjNumber(), Arrays.asList(sampling.getProId().split(","))); + }else { + allPrice = tbTransitionMapper.getLisPriceByTjNumAndParentProId(tjOrder.getTjNumber(), sampling.getProId()); + } + lisSaveSqdxxDto.setFyje(allPrice.toString()); +// lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode()); + lisSaveSqdxxDto.setYbbm(sampling.getYb()); - lisSaveSqdxxDto.setJyxmlist(dtos); - log.info("妫�楠岀敵璇峰弬鏁� ->{}",JSONUtil.toJsonStr(lisSaveSqdxxDto)); - AjaxResult ajaxResult = lisApiMethodService.saveSqdxx(lisSaveSqdxxDto); - // Lis璇锋眰杩斿洖 ->{"msg":"鎿嶄綔澶辫触","code":500,"result":{"Response":{"ResultContent":"鎴愬姛","ResultData":null,"ResultCode":"1"}}} - // {"msg":"鎿嶄綔鎴愬姛","code":200,"data":{"ResultContent":"鎴愬姛","ResultData":null,"ResultCode":"1"}} - log.info("Lis璇锋眰杩斿洖 ->{}",JSONUtil.toJsonStr(ajaxResult)); - String result = ajaxResult.get("data").toString(); - JSONObject object = JSONUtil.parseObj(result); - String code = object.getStr("ResultCode"); - if(code.equals("1")){ - for (OutpintestapplyDetailsDto detail : detailsDtos) { - LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); - tree.setCardId(tjOrder.getCardId()); - tree.setPationid(tjCustomer.getPationId()); - tree.setSqdh(jyxh); - tree.setFyhj(allPrice.toString()); - String mxfyxmbm = detail.getMxfyxmbm(); - tree.setHisXmdm(mxfyxmbm); - tree.setType("妫�楠�"); - tree.setTjPrice(String.valueOf(detail.getProjg())); - 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> wrapper3 = new LambdaQueryWrapper<>(); - wrapper3.eq(LtkjMxjfxmzd::getXmdm, xmdm); - LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper3); - LambdaQueryWrapper<LtkjEjjfxmzd> wrapper4 = new LambdaQueryWrapper<>(); - wrapper4.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); - LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper4); - tree.setXmfl(ejjfxmzd.getYjkmdm()); - } - tree.setCreateTime(DateUtil.date()); - ltkjJianchajianyanTreeService.save(tree); - } - }else { - log.error("璇锋眰澶辫触 ->{}",lisSaveSqdxxDto); - } - } - } + if (sampling.getIsMerge() == 1){ + LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TjSampling::getParentId, sampling.getId()); + List<TjSampling> list = tjSamplingService.list(wrapper); + for (TjSampling tjSampling : list) { + TjProject project = projectService.getById(tjSampling.getProId()); + if (StrUtil.isBlank(tjSampling.getJyxmdm())){ + LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(TjProject::getProParentId,project.getProId()); + List<TjProject> projects = projectService.list(wrapper1); + for (TjProject tjProject : projects) { + LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto(); + dto.setXh(String.valueOf(xh.getAndIncrement() + 1)); + dto.setJyxm(tjProject.getLisXmbm()); + dto.setXmmc(tjProject.getProName()); + dtos.add(dto); } + }else { + LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto(); + dto.setXh(String.valueOf(xh.getAndIncrement() + 1)); + dto.setJyxm(tjSampling.getJyxmdm()); + dto.setXmmc(tjSampling.getProName()); + dtos.add(dto); } + + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailsDto.setProjg(project.getProPrice()); + detailsDtos.add(detailsDto); + } + }else { + TjProject project = projectService.getById(sampling.getProId()); + if (StrUtil.isBlank(sampling.getJyxmdm())){ + LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(TjProject::getProParentId,project.getProId()); + List<TjProject> projects = projectService.list(wrapper1); + for (TjProject tjProject : projects) { + LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto(); + dto.setXh(String.valueOf(xh.getAndIncrement() + 1)); + dto.setJyxm(tjProject.getLisXmbm()); + dto.setXmmc(tjProject.getProName()); + dtos.add(dto); + } + }else { + LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto(); + dto.setXh(String.valueOf(xh.getAndIncrement() + 1)); + dto.setJyxm(sampling.getJyxmdm()); + dto.setXmmc(sampling.getProName()); + dtos.add(dto); + } + + OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); + detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { + detailsDto.setSfzhfy("1"); + } else { + detailsDto.setSfzhfy("0"); + } + detailsDto.setSl(project.getSl()); + detailsDto.setProjg(project.getProPrice()); + detailsDtos.add(detailsDto); + } + + lisSaveSqdxxDto.setJyxmlist(dtos); + log.info("妫�楠岀敵璇峰弬鏁� ->{}", JSONUtil.toJsonStr(lisSaveSqdxxDto)); +// if (true) +// return true; + AjaxResult ajaxResult = lisApiMethodService.saveSqdxx(lisSaveSqdxxDto); + // Lis璇锋眰杩斿洖 ->{"msg":"鎿嶄綔澶辫触","code":500,"result":{"Response":{"ResultContent":"鎴愬姛","ResultData":null,"ResultCode":"1"}}} + // {"msg":"鎿嶄綔鎴愬姛","code":200,"data":{"ResultContent":"鎴愬姛","ResultData":null,"ResultCode":"1"}} + log.info("Lis璇锋眰杩斿洖 ->{}", JSONUtil.toJsonStr(ajaxResult)); + String result = ajaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code = object.getStr("ResultCode"); + if (code.equals("1")) { + for (OutpintestapplyDetailsDto detail : detailsDtos) { + LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); + tree.setCardId(tjOrder.getCardId()); + tree.setPationid(tjCustomer.getPationId()); + tree.setSqdh(sampling.getJyxh()); + tree.setFyhj(allPrice.toString()); + String mxfyxmbm = detail.getMxfyxmbm(); + tree.setHisXmdm(mxfyxmbm); + tree.setType("妫�楠�"); + tree.setService("lis"); + tree.setTjPrice(String.valueOf(detail.getProjg())); + 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> wrapper3 = new LambdaQueryWrapper<>(); + wrapper3.eq(LtkjMxjfxmzd::getXmdm, xmdm); + LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper3); + LambdaQueryWrapper<LtkjEjjfxmzd> wrapper4 = new LambdaQueryWrapper<>(); + wrapper4.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm()); + LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper4); + tree.setXmfl(ejjfxmzd.getYjkmdm()); + } + tree.setCreateTime(DateUtil.date()); + tree.setJxbz(sampling.getJxbz()); + ltkjJianchajianyanTreeService.save(tree); + } + return true; + } else { + log.error("璇锋眰澶辫触 ->{}", lisSaveSqdxxDto); + return false; + } + } + + public Boolean save(Map<String, List<TjProject>> listMap,TjOrder tjOrder,TjCustomer tjCustomer){ + boolean flag = true; + for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) { + String jyxh = idUtils.generateLisID(configService.selectConfigByKey("make_lis_tmh_prefix")); + String dept = configService.selectConfigByKey("request_default_dept"); + String ysbm = configService.selectConfigByKey("request_default_ysbm"); + AtomicInteger xh = new AtomicInteger(); + LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto(); + lisSaveSqdxxDto.setJyxh(jyxh); + lisSaveSqdxxDto.setBah(tjOrder.getCardId()); + lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName()); + lisSaveSqdxxDto.setBrdm(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "")); + lisSaveSqdxxDto.setXb(tjCustomer.getCusSex() == 1 ? "2" : "1"); + lisSaveSqdxxDto.setCsrq(DateFormatUtils.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd")); + AgeResult ageResult = DateUtils.calculateAge(tjCustomer.getCusBrithday()); + lisSaveSqdxxDto.setNl(String.valueOf(ageResult.getAge())); + lisSaveSqdxxDto.setNldw(String.valueOf(ageResult.getUnit())); + lisSaveSqdxxDto.setSfzh(tjCustomer.getCusIdcard()); + lisSaveSqdxxDto.setLxdh(tjCustomer.getCusPhone()); + lisSaveSqdxxDto.setJtzz(""); + Date date = new Date(); + lisSaveSqdxxDto.setSqrq(DateFormatUtils.format(date, "yyyy-MM-dd HH:mm:ss")); + lisSaveSqdxxDto.setCyrq(""); + lisSaveSqdxxDto.setLczd(""); + lisSaveSqdxxDto.setBz(""); + lisSaveSqdxxDto.setKsbm(dept); + lisSaveSqdxxDto.setSqys(ysbm); + lisSaveSqdxxDto.setKfbz("1"); + List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>(); + ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>(); + + BigDecimal allPrice = tbTransitionMapper.getLisPriceByTjNumAndInProId(tjOrder.getTjNumber(), entry.getValue().stream().map(TjProject::getProId).collect(Collectors.toList())); + + lisSaveSqdxxDto.setFyje(allPrice.toString()); +// lisSaveSqdxxDto.setYbbm(entry.getKey()); + String s = entry.getKey(); + lisSaveSqdxxDto.setYbbm(s.substring(s.indexOf("_") + 1)); + + + String hisBms =""; + for (TjProject tjProject : entry.getValue()) { + LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto(); + dto.setXh(String.valueOf(xh.getAndIncrement() + 1)); + dto.setJyxm(tjProject.getLisXmbm()); + dto.setXmmc(tjProject.getProName()); + dtos.add(dto); + hisBms+=tjProject.getHisXmbm()+","; + } + + + lisSaveSqdxxDto.setJyxmlist(dtos); + log.info("妫�楠岀敵璇峰弬鏁� ->{}", JSONUtil.toJsonStr(lisSaveSqdxxDto)); + AjaxResult ajaxResult = lisApiMethodService.saveSqdxx(lisSaveSqdxxDto); + log.info("Lis璇锋眰杩斿洖 ->{}", JSONUtil.toJsonStr(ajaxResult)); + String result = ajaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code = object.getStr("ResultCode"); + if (!code.equals("1")) { + log.error("璇锋眰澶辫触 ->{}", lisSaveSqdxxDto); + flag = false; + break; + }else { + LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree(); + tree.setCardId(tjOrder.getCardId()); + tree.setPationid(tjCustomer.getPationId()); + tree.setSqdh("jk"+jyxh); + tree.setFyhj(String.valueOf(allPrice)); + tree.setHisXmdm(hisBms.substring(0,hisBms.length()-1)); + tree.setType("妫�楠�"); + tree.setService("lis"); + tree.setTjPrice(String.valueOf(allPrice)); + tree.setCreateTime(DateUtil.date()); + tree.setXmfl(lisSaveSqdxxDto.getYbbm()); + ltkjJianchajianyanTreeService.save(tree); } } - return true; + return flag; } /** @@ -202,7 +325,7 @@ - private LtkjJyxmzd getJyxmzd(TjProject project) { + public LtkjJyxmzd getJyxmzd(TjProject project) { String jyxmdm = ""; if (project.getSfzhfy().equals("Y")){ LambdaQueryWrapper<LtkjJfzhgljyxmzd> wrapper = new LambdaQueryWrapper<>(); @@ -221,4 +344,31 @@ if (jyxmzd != null) return jyxmzd; return null; } + + /** + * 鏍规嵁浣撴绫诲瀷鍒ゆ柇鏄惁闇�瑕佺洿鎺ヤ粠Lis銆乸acs鐩存帴鐢宠 + */ + public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) { + try { + + String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team"); + log.info("鏍规嵁浣撴绫诲瀷鍒ゆ柇鏄惁闇�瑕佺洿鎺ヤ粠Lis銆乸acs鐩存帴鐢宠 :"+tjOrder.getTjType()+"_"+useLisAndPacsRegisterDictTeam); + String[] split = useLisAndPacsRegisterDictTeam.split(",|锛寍銆倈锛殀:"); + List<String> list = Arrays.asList(split); + log.info("鍙傛暟閰嶇疆閲岄潰鐨勫�间负 list :"+list); + return list.contains(tjOrder.getTjType()); + } catch (Exception e) { + log.error("isUseLisAndPacsRegister"+e.getMessage()); + return false; + } + } + + /** + * 妫�楠岄」鐩瓧鍏哥殑妫�楠屽垎绫讳唬鐮佷笉鑳藉瓨鍦ㄤ簬璇ユ帴鍙h繑鍥炰腑锛屽鏋滃瓨鍦ㄥ垯涓嶈兘鍚堝苟 + * 鑾峰彇妫�楠屽垎绫诲悎骞朵俊鎭瓧鍏� 瀛樺湪鎵嶈兘鍚堝苟鍙戦�� 涓嶅瓨鍦ㄥ垯鍙兘鍗曟鍙戦�� + * @return + */ + public AjaxResult getJyFlHb(){ + return lisApiMethodService.getJyflhbxx(); + } } -- Gitblit v1.8.0