From e8740ff335d406b21ba7724714e1d7e951170daa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 三月 2025 15:57:28 +0800
Subject: [PATCH] zjh20250328
---
ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java | 247 -------------------------------------------------
1 files changed, 1 insertions(+), 246 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 32e0250..8391e61 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,8 +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;
import cn.hutool.json.JSONUtil;
@@ -11,7 +9,7 @@
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;
@@ -68,132 +66,6 @@
@Autowired
private ITjSamplingService tjSamplingService;
- /**
- * 淇濆瓨妫�楠屽崟鐢宠淇℃伅
- * @param tjOrder
- * @param tjCustomer
- * @param detailList
- * @return
- * @deprecated 淇敼 涓嶄娇鐢↙ist<TbTransition>浼犲弬鏁�
- */
- @Deprecated
- public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TbTransition> detailList){
- if (detailList != null && !detailList.isEmpty()) {
- String dept = configService.selectConfigByKey("request_default_dept");
- String ysbm = configService.selectConfigByKey("request_default_ysbm");
- String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
- 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(lis_tmh_prefix);
- 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 = 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);
-
- 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.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());
- ltkjJianchajianyanTreeService.save(tree);
- }
- }else {
- log.error("璇锋眰澶辫触 ->{}",lisSaveSqdxxDto);
- }
- }
- }
- }
- }
- }
- }
- return true;
- }
public Boolean save(TjSampling sampling,TjOrder tjOrder,TjCustomer tjCustomer){
String dept = configService.selectConfigByKey("request_default_dept");
@@ -322,123 +194,6 @@
log.error("璇锋眰澶辫触 ->{}", lisSaveSqdxxDto);
return false;
}
- }
-
- public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TjProject> projects,List<TbTransition> detailList) {
-// 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()) {
- String dept = configService.selectConfigByKey("request_default_dept");
- String ysbm = configService.selectConfigByKey("request_default_ysbm");
- String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
- // 鏍规嵁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(lis_tmh_prefix);
- 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 = 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);
-
- 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.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());
- ltkjJianchajianyanTreeService.save(tree);
- }
- } else {
- log.error("璇锋眰澶辫触 ->{}", lisSaveSqdxxDto);
- }
- }
- }
- }
- }
- }
- return true;
}
/**
--
Gitblit v1.8.0