From 971162978842f8cf87d34f99da8c529e2e945da8 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期二, 15 四月 2025 08:46:57 +0800 Subject: [PATCH] zjh20250415 --- ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 371 ++++++++++++++++++++++++++++------------------------ 1 files changed, 199 insertions(+), 172 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java index 6e660b0..6ca25c6 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java @@ -1,6 +1,5 @@ package com.ltkj.web.controller.service; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -14,7 +13,7 @@ import com.ltkj.common.core.domain.entity.SysDept; import com.ltkj.common.core.domain.entity.SysUser; import com.ltkj.common.core.redis.RedisCache; -import com.ltkj.common.utils.IdUtils; +import com.ltkj.hosp.idutil.IdUtils; import com.ltkj.common.utils.StringUtils; import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.*; @@ -452,101 +451,107 @@ } public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) { - String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix"); - String config = configService.selectConfigByKey("sfkqdyhis"); - Boolean lisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order); - if (null != detailList && detailList1) { - String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS"); - for (TjOrderDetail detail : detailList) { - TjSampling sampling = new TjSampling(); - if (null == projectService.getById(detail.getProId())) continue; - TjProject project = projectService.getById(detail.getProId()); - Long proParentId = project.getProParentId(); - String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType()); - if (null != proParentId && proParentId == 0) { - sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); -// LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project); -// if (jyxmzd != null) { - if (config.equals("Y") && lisAndPacsRegister) - sampling.setJyxmdm(project.getLisXmbm()); - else sampling.setJyxmdm(String.valueOf(project.getProId())); - sampling.setSpecimenTypeCode(project.getSpecimenType()); - sampling.setSpecimenType(dictLabel); -// LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm()); -// LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper); -// sampling.setSpecimenType(jybbzd.getJybbmc()); -// sampling.setJyxmdm(jyxmzd.getJyxmdm()); -// } - } else { - TjProject project1 = projectService.getById(proParentId); - sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); - sampling.setSpecimenTypeCode(project1.getSpecimenType()); - sampling.setSpecimenType(dictLabel); - if (config.equals("Y") && lisAndPacsRegister) - sampling.setJyxmdm(project1.getLisXmbm()); - else sampling.setJyxmdm(String.valueOf(project1.getProId())); -// LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project1); -// if (jyxmzd != null) { -// sampling.setSpecimenTypeCode(jyxmzd.getJybbdm()); -// LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm()); -// LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper); -// sampling.setSpecimenType(jybbzd.getJybbmc()); -// sampling.setJyxmdm(jyxmzd.getJyxmdm()); -// } + try { + String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix"); + String config = configService.selectConfigByKey("sfkqdyhis"); + Boolean lisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order); + if (null != detailList && detailList1) { + String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS"); + for (TjOrderDetail detail : detailList) { + int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId())); + if(i>0) continue; + TjSampling sampling = new TjSampling(); + if (null == projectService.getById(detail.getProId())) continue; + TjProject project = projectService.getById(detail.getProId()); + Long proParentId = project.getProParentId(); + String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType()); + if (null != proParentId && proParentId == 0) { + sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); + // LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project); + // if (jyxmzd != null) { + if (config.equals("Y") && lisAndPacsRegister) + sampling.setJyxmdm(project.getLisXmbm()); + else sampling.setJyxmdm(String.valueOf(project.getProId())); + sampling.setSpecimenTypeCode(project.getSpecimenType()); + sampling.setSpecimenType(dictLabel); + // LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>(); + // wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm()); + // LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper); + // sampling.setSpecimenType(jybbzd.getJybbmc()); + // sampling.setJyxmdm(jyxmzd.getJyxmdm()); + // } + } else { + TjProject project1 = projectService.getById(proParentId); + sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); + sampling.setSpecimenTypeCode(project1.getSpecimenType()); + sampling.setSpecimenType(dictLabel); + if (config.equals("Y") && lisAndPacsRegister) + sampling.setJyxmdm(project1.getLisXmbm()); + else sampling.setJyxmdm(String.valueOf(project1.getProId())); + // LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project1); + // if (jyxmzd != null) { + // sampling.setSpecimenTypeCode(jyxmzd.getJybbdm()); + // LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>(); + // wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm()); + // LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper); + // sampling.setSpecimenType(jybbzd.getJybbmc()); + // sampling.setJyxmdm(jyxmzd.getJyxmdm()); + // } + } + sampling.setSamplingNumber(format); + sampling.setTjNum(order.getTjNumber()); + sampling.setCusId(String.valueOf(order.getUserId())); + if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) { + sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName()); + } + sampling.setApplicationTime(new Date()); + sampling.setTjTime(order.getCreateTime()); + sampling.setProId(String.valueOf(detail.getProId())); + sampling.setProName(projectService.getById(detail.getProId()).getProName()); + sampling.setCreateBy(sysUser.getNickName()); + sampling.setCreateTime(new Date()); + sampling.setUpdateBy(sysUser.getNickName()); + sampling.setUpdateTime(new Date()); + sampling.setCreateId(String.valueOf(sysUser.getUserId())); + sampling.setUpdateId(String.valueOf(sysUser.getUserId())); + sampling.setJxbz(jxbz); + samplingService.save(sampling); } - sampling.setSamplingNumber(format); - sampling.setTjNum(order.getTjNumber()); - sampling.setCusId(String.valueOf(order.getUserId())); - if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) { - sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName()); - } - sampling.setApplicationTime(new Date()); - sampling.setTjTime(order.getCreateTime()); - sampling.setProId(String.valueOf(detail.getProId())); - sampling.setProName(projectService.getById(detail.getProId()).getProName()); - sampling.setCreateBy(sysUser.getNickName()); - sampling.setCreateTime(new Date()); - sampling.setUpdateBy(sysUser.getNickName()); - sampling.setUpdateTime(new Date()); - sampling.setCreateId(String.valueOf(sysUser.getUserId())); - sampling.setUpdateId(String.valueOf(sysUser.getUserId())); - sampling.setJxbz(jxbz); - samplingService.save(sampling); } - } - if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){ - AjaxResult ajaxResult = lisApiMethod.getJyFlHb(); - if (ajaxResult.get("code").toString().equals("200")){ - String str = ajaxResult.get("data").toString(); - str = str.replace("=", ":"); - JSONArray array = JSONUtil.parseArray(str); - for (Object o : array) { - JSONObject object = (JSONObject) o; - LisJyflhb lisJyflhb = new LisJyflhb(); - lisJyflhb.setHbhxm(object.getStr("hbhxm")); - lisJyflhb.setFlmc(object.getStr("flmc")); - lisJyflhb.setMc(object.getStr("mc")); - lisJyflhb.setFlbm(object.getStr("flbm")); - LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm()); - LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper); - if (jyflhb == null) { - lisJyflhb.setId(IdUtil.getSnowflake().nextId()); - lisJyflhbService.save(lisJyflhb); - }else { - lisJyflhb.setId(jyflhb.getId()); - lisJyflhbService.updateById(lisJyflhb); + if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){ + AjaxResult ajaxResult = lisApiMethod.getJyFlHb(); + if (ajaxResult.get("code").toString().equals("200")){ + String str = ajaxResult.get("data").toString(); + str = str.replace("=", ":"); + JSONArray array = JSONUtil.parseArray(str); + for (Object o : array) { + JSONObject object = (JSONObject) o; + LisJyflhb lisJyflhb = new LisJyflhb(); + lisJyflhb.setHbhxm(object.getStr("hbhxm")); + lisJyflhb.setFlmc(object.getStr("flmc")); + lisJyflhb.setMc(object.getStr("mc")); + lisJyflhb.setFlbm(object.getStr("flbm")); + LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm()); + LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper); + if (jyflhb == null) { + lisJyflhb.setId(IdUtil.getSnowflake().nextId()); + lisJyflhbService.save(lisJyflhb); + }else { + lisJyflhb.setId(jyflhb.getId()); + lisJyflhbService.updateById(lisJyflhb); + } } } - } - } - if (StrUtil.isNotBlank(jxbz)){ - tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz); - }else { - tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId())); + } + if (StrUtil.isNotBlank(jxbz)){ + tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz); + }else { + tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId())); + } + } catch (Exception e) { + log.error(e.getMessage()); } } @@ -603,7 +608,7 @@ }else { deptname=dept.getDeptName(); } - + String xb= tjCustomerService.getSexByTjh(order.getTjNumber()); for (TjOrderDetail detail : tjOrderDetailList) { detail.setTjStatus(1L); @@ -632,7 +637,7 @@ for (String s : split) { s = s.replaceAll("\n", ""); // Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s); - Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0"); + Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0",xb); if(null !=mapss && !mapss.isEmpty()){ Object bt = mapss.get("bt"); Object nr = mapss.get("nr"); @@ -868,82 +873,89 @@ } public void addCaiYangDengJiByDiaoYongShiTu(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) { - String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix"); - if (null != detailList && detailList1) { - Date date = new Date(); - String format = DateUtil.format(date, "yyMMddHHmmssSSS"); - for (TjOrderDetail detail : detailList) { - TjSampling sampling = new TjSampling(); - if (null == projectService.getById(detail.getProId())) continue; - TjProject project = projectService.getById(detail.getProId()); - Long proParentId = project.getProParentId(); - String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType()); - if (null != proParentId && proParentId == 0) { - sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); - sampling.setSpecimenTypeCode(project.getSpecimenType()); - sampling.setSpecimenType(dictLabel); - sampling.setJyxmdm(project.getProId().toString()); - } else { - TjProject project1 = projectService.getById(proParentId); - sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); + try { + String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix"); + if (null != detailList && detailList1) { + Date date = new Date(); + String format = DateUtil.format(date, "yyMMddHHmmssSSS"); + for (TjOrderDetail detail : detailList) { + int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId())); + if(i>0) continue; - sampling.setSpecimenTypeCode(project1.getSpecimenType()); - sampling.setSpecimenType(dictLabel); - sampling.setJyxmdm(project.getProId().toString()); + TjSampling sampling = new TjSampling(); + if (null == projectService.getById(detail.getProId())) continue; + TjProject project = projectService.getById(detail.getProId()); + Long proParentId = project.getProParentId(); + String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType()); + if (null != proParentId && proParentId == 0) { + sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); + sampling.setSpecimenTypeCode(project.getSpecimenType()); + sampling.setSpecimenType(dictLabel); + sampling.setJyxmdm(project.getProId().toString()); + } else { + TjProject project1 = projectService.getById(proParentId); + sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); + sampling.setSpecimenTypeCode(project1.getSpecimenType()); + sampling.setSpecimenType(dictLabel); + sampling.setJyxmdm(project.getProId().toString()); + + } + sampling.setSamplingNumber(format); + sampling.setTjNum(order.getTjNumber()); + sampling.setCusId(String.valueOf(order.getUserId())); + if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) { + sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName()); + } + sampling.setApplicationTime(date); + sampling.setTjTime(order.getCreateTime()); + sampling.setProId(String.valueOf(detail.getProId())); + sampling.setProName(projectService.getById(detail.getProId()).getProName()); + sampling.setCreateBy(sysUser.getNickName()); + sampling.setCreateTime(date); + sampling.setUpdateBy(sysUser.getNickName()); + sampling.setUpdateTime(date); + sampling.setCreateId(String.valueOf(sysUser.getUserId())); + sampling.setUpdateId(String.valueOf(sysUser.getUserId())); + sampling.setJxbz(jxbz); + samplingService.save(sampling); } - sampling.setSamplingNumber(format); - sampling.setTjNum(order.getTjNumber()); - sampling.setCusId(String.valueOf(order.getUserId())); - if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) { - sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName()); - } - sampling.setApplicationTime(date); - sampling.setTjTime(order.getCreateTime()); - sampling.setProId(String.valueOf(detail.getProId())); - sampling.setProName(projectService.getById(detail.getProId()).getProName()); - sampling.setCreateBy(sysUser.getNickName()); - sampling.setCreateTime(date); - sampling.setUpdateBy(sysUser.getNickName()); - sampling.setUpdateTime(date); - sampling.setCreateId(String.valueOf(sysUser.getUserId())); - sampling.setUpdateId(String.valueOf(sysUser.getUserId())); - sampling.setJxbz(jxbz); - samplingService.save(sampling); } - } - String config = configService.selectConfigByKey("sfkqdyhis"); - if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){ - AjaxResult ajaxResult = lisApiMethod.getJyFlHb(); - if (ajaxResult.get("code").toString().equals("200")){ - String str = ajaxResult.get("data").toString(); - str = str.replace("=", ":"); - JSONArray array = JSONUtil.parseArray(str); - for (Object o : array) { - JSONObject object = (JSONObject) o; - LisJyflhb lisJyflhb = new LisJyflhb(); - lisJyflhb.setHbhxm(object.getStr("hbhxm")); - lisJyflhb.setFlmc(object.getStr("flmc")); - lisJyflhb.setMc(object.getStr("mc")); - lisJyflhb.setFlbm(object.getStr("flbm")); - LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm()); - LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper); - if (jyflhb == null) { - lisJyflhb.setId(IdUtil.getSnowflake().nextId()); - lisJyflhbService.save(lisJyflhb); - }else { - lisJyflhb.setId(jyflhb.getId()); - lisJyflhbService.updateById(lisJyflhb); + String config = configService.selectConfigByKey("sfkqdyhis"); + if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){ + AjaxResult ajaxResult = lisApiMethod.getJyFlHb(); + if (ajaxResult.get("code").toString().equals("200")){ + String str = ajaxResult.get("data").toString(); + str = str.replace("=", ":"); + JSONArray array = JSONUtil.parseArray(str); + for (Object o : array) { + JSONObject object = (JSONObject) o; + LisJyflhb lisJyflhb = new LisJyflhb(); + lisJyflhb.setHbhxm(object.getStr("hbhxm")); + lisJyflhb.setFlmc(object.getStr("flmc")); + lisJyflhb.setMc(object.getStr("mc")); + lisJyflhb.setFlbm(object.getStr("flbm")); + LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm()); + LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper); + if (jyflhb == null) { + lisJyflhb.setId(IdUtil.getSnowflake().nextId()); + lisJyflhbService.save(lisJyflhb); + }else { + lisJyflhb.setId(jyflhb.getId()); + lisJyflhbService.updateById(lisJyflhb); + } } } - } - } - if (StrUtil.isNotBlank(jxbz)){ - tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz); - }else { - tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId())); + } + if (StrUtil.isNotBlank(jxbz)){ + tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz); + }else { + tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId())); + } + } catch (Exception e) { + log.error(e.getMessage()); } } @@ -1730,17 +1742,32 @@ if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) { if (null != project.getHisXmbm()) { { - mapJinchuan.add(project.getProParentId().toString()); - OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto(); - detailsDto.setMxfyxmbm(project.getHisXmbm()); + if (project.getSfzhfy().equals("Y")) { - detailsDto.setSfzhfy("1"); - } else { - detailsDto.setSfzhfy("0"); + mapJinchuan.add(project.getProParentId().toString()); + 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()); + detailDtos.add(detailsDto); } - detailsDto.setSl(project.getSl()); - detailsDto.setProjg(project.getProPrice()); - detailDtos.add(detailsDto); + +// mapJinchuan.add(project.getProParentId().toString()); +// 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()); +// detailDtos.add(detailsDto); } } List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList()); -- Gitblit v1.8.0