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 | 364 +++++++++++++++++----------------------------------
1 files changed, 120 insertions(+), 244 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 9ef83c5..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,7 +10,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,130 +67,10 @@
@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()) {
- 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);
-
- 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);
- }
- }
- }
- }
- }
- }
- }
- return true;
- }
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();
@@ -212,8 +91,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -224,7 +103,8 @@
allPrice = tbTransitionMapper.getLisPriceByTjNumAndParentProId(tjOrder.getTjNumber(), sampling.getProId());
}
lisSaveSqdxxDto.setFyje(allPrice.toString());
- lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode());
+// lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode());
+ lisSaveSqdxxDto.setYbbm(sampling.getYb());
if (sampling.getIsMerge() == 1){
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
@@ -232,11 +112,24 @@
List<TjSampling> list = tjSamplingService.list(wrapper);
for (TjSampling tjSampling : list) {
TjProject project = projectService.getById(tjSampling.getProId());
- LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
- dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
- dto.setJyxm(tjSampling.getJyxmdm());
- dto.setXmmc(tjSampling.getProName());
- dtos.add(dto);
+ 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());
@@ -251,11 +144,24 @@
}
}else {
TjProject project = projectService.getById(sampling.getProId());
- LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
- dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
- dto.setJyxm(sampling.getJyxmdm());
- dto.setXmmc(sampling.getProName());
- dtos.add(dto);
+ 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());
@@ -318,117 +224,83 @@
}
}
- 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()) {
- // 鏍规嵁project琛ㄧ殑his_xmbm鏌ョ粍鍚堝叧鑱旇〃 ltkj_jfzhgljyxmzd 鏍规嵁瀛楁`zhxmdm`
- // - 鏌ュ埌 浣跨敤瀛楁`jyxmdm`鏌ユ楠岄」鐩瓧鍏歌〃 ltkj_jyxmzd 鏍规嵁瀛楁`jyxmdm`
- // - 鏈煡鍒� 鏌ラ」鐩叧鑱旇〃ltkj_jfxmgljyxmzd 鏍规嵁瀛楁`xmdm`
+ 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();
- 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);
+ 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<>();
- 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);
+ BigDecimal allPrice = tbTransitionMapper.getLisPriceByTjNumAndInProId(tjOrder.getTjNumber(), entry.getValue().stream().map(TjProject::getProId).collect(Collectors.toList()));
- 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);
- }
- }
- }
- }
+ 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;
}
/**
@@ -478,11 +350,15 @@
*/
public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
try {
+
String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
- String[] split = useLisAndPacsRegisterDictTeam.split(",");
+ 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;
}
}
--
Gitblit v1.8.0