From c87dee0033340b62e820f7a012ab2d9bfb89b12a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 19 二月 2025 16:41:29 +0800
Subject: [PATCH] zjh20250219
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 298 +++++++++++++++++++++++++++++------------------------------
1 files changed, 148 insertions(+), 150 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 4ac8e85..1d9ee4d 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
@@ -8,6 +8,7 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import com.alibaba.druid.sql.visitor.functions.If;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
@@ -174,7 +175,6 @@
private ITjProAdvicerulesService tjProAdvicerulesService;
-
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
long l = System.currentTimeMillis();
@@ -201,7 +201,7 @@
redisCache.deleteObject(tjCustomer.getCusIdcard() + "cusId");
if (null != tbTransitionList && tbTransitionList.size() > 0) {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
//淇敼姣忛」鐨勫師浠风幇浠�
for (TbTransition transition : tbTransitionList) {
@@ -254,7 +254,7 @@
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
- String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
+ String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
if (!b) {
List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
if (null != proList && !proList.isEmpty()) {
@@ -310,13 +310,13 @@
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
+ orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
}
}
if (tjFlowingWater.getPayStasus() == 1) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
+ orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
}
if (tjFlowingWater.getDiscount() == null) {
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
@@ -324,7 +324,7 @@
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
}
- tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
// if (list != null) {
// for (TjOrderDetail tjOrderDetail : list) {
@@ -439,12 +439,12 @@
}
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null);
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser, null);
List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(order.getTjNumber());
xdPictureService.saveBatch(xdPictureList);
}
- public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
+ 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);
@@ -509,9 +509,9 @@
samplingService.save(sampling);
}
}
- if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
- if (ajaxResult.get("code").toString().equals("200")){
+ if (ajaxResult.get("code").toString().equals("200")) {
String str = ajaxResult.get("data").toString();
str = str.replace("=", ":");
JSONArray array = JSONUtil.parseArray(str);
@@ -523,12 +523,12 @@
lisJyflhb.setMc(object.getStr("mc"));
lisJyflhb.setFlbm(object.getStr("flbm"));
LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
+ wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
if (jyflhb == null) {
lisJyflhb.setId(IdUtil.getSnowflake().nextId());
lisJyflhbService.save(lisJyflhb);
- }else {
+ } else {
lisJyflhb.setId(jyflhb.getId());
lisJyflhbService.updateById(lisJyflhb);
}
@@ -536,10 +536,10 @@
}
}
- 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()));
}
}
@@ -586,22 +586,23 @@
@Override
//@Async("async")
- public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order,TjOrderRemark orderRemark) {
+ public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order, TjOrderRemark orderRemark) {
String currentDataSource = DynamicDataSourceContextHolder.getDataSourceType();
log.info("寮傛绾跨▼涓殑鏁版嵁婧�: {}", currentDataSource);
- String deptname="";
+ String deptname = "";
TjProject tjProject = projectService.getById(orderRemark.getProId());
- if(null !=tjProject){
+ if (null != tjProject) {
SysDept dept = deptService.getById(tjProject.getDeptId());
- if(dept.getParentId()!=100L){
- deptname= deptService.getprentks(dept.getParentId().toString());
- }else {
- deptname=dept.getDeptName();
+ if (dept.getParentId() != 100L) {
+ deptname = deptService.getprentks(dept.getParentId().toString());
+ } else {
+ deptname = dept.getDeptName();
}
-
+ String ssyszy="";
for (TjOrderDetail detail : tjOrderDetailList) {
+
detail.setTjStatus(1L);
LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjStandard::getProId, detail.getProId());
@@ -611,46 +612,58 @@
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
tjOrderDetailService.updateById(detail);
try {
- LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh,order.getTjNumber());
- wq.eq(TjOrderYcxm::getJcxm,detail.getProName());
- TjOrderYcxm ycxm = ycxmService.getOne(wq);
- if(null !=ycxm){
- ycxm.setJcjg(detail.getProResult());
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- ,detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", ""),"",order.getTjNumber()
- ,detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", "")
- ,detail.getProResult());
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, order.getTjNumber());
+ wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
+ if (detail.getExceptionDesc() == 1) {
+ TjOrderYcxm ycxm = ycxmService.getOne(wq);
+ if (null != ycxm) {
+ ycxm.setJcjg(detail.getProResult());
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
+ , detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), "", order.getTjNumber()
+ , detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
+ , detail.getProResult());
- String[] split = detail.getProResult().split("銆倈,|锛�");
- List<Map<String,Object>> mapList=new ArrayList<>();
- for (String s : split) {
- s = s.replaceAll("\n", "");
+ String[] split = detail.getProResult().split("銆倈,|锛�");
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "");
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
- Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0");
- if(null !=mapss && !mapss.isEmpty()){
- Object bt = mapss.get("bt");
- Object nr = mapss.get("nr");
- if(null !=bt || null !=nr){
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0");
+ if (null != mapss && !mapss.isEmpty()) {
+ Object bt = mapss.get("bt");
+ Object nr = mapss.get("nr");
+ if (null != bt || null != nr) {
- } mapList.add(mapss);
+ }
+ mapList.add(mapss);
+ }
}
- }
- if(null != maps && !maps.isEmpty()){
- ycxm.setJynr(JSONUtil.toJsonStr(maps));
+ if (null != maps && !maps.isEmpty()) {
+ ycxm.setJynr(JSONUtil.toJsonStr(maps));
+ }
+ if (!mapList.isEmpty()) {
+ ycxm.setJynr(JSONUtil.toJsonStr(mapList));
+ }
+ if(detail.getProName().contains("鑸掑紶鍘�")||detail.getProName().contains("鏀剁缉鍘�")){
+ ssyszy+=ycxm.getJcxm();
+ }
+ ycxmService.updateById(ycxm);
}
- if( !mapList.isEmpty()){
- ycxm.setJynr(JSONUtil.toJsonStr(mapList));
- }
- ycxmService.updateById(ycxm);
- if(detail.getExceptionDesc()==0)ycxmService.remove(wq);
+ }else {
+ ycxmService.remove(wq);
}
+
+
} catch (Exception e) {
+ e.printStackTrace();
+ log.error(e.getMessage());
}
+
}
}
@@ -674,14 +687,14 @@
@Override
// //@Async("async")
// @Transactional
- public Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser,String jxbz) {
+ public Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser, String jxbz) {
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
tjFlowingWater.setJxbz(jxbz);
tjFlowingWaterService.updateById(tjFlowingWater);
- TjProBl proBl=new TjProBl();
+ TjProBl proBl = new TjProBl();
proBl.setTjh(order.getTjNumber());
proBl.setBldh(jxbz);
proBl.setBlsj(date);
@@ -694,7 +707,7 @@
String config = configService.selectConfigByKey("sfkqdyhis");
- List<TjProject> projectList=new ArrayList<>();
+ List<TjProject> projectList = new ArrayList<>();
// ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>();
for (String tjProId : tjProIds) {
@@ -751,12 +764,12 @@
//濡傛灉璇ラ」鐩瓨鍦� 鍒� 涓嶄繚瀛�
TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
- if(null !=orderDetail) continue;
+ if (null != orderDetail) continue;
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
TjProject projectss = projectService.getById(projects.getProParentId());
- if (null != projectss && projectss.getProParentId()==0L) {
+ if (null != projectss && projectss.getProParentId() == 0L) {
projectList.add(projectss);
}
}
@@ -777,10 +790,10 @@
}
- List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(),tjProId);
+ List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(), tjProId);
if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
for (TbTransition transition : tbTransitionList) {
- transitionService.updateTbTransitionById(transition.getId().toString(),jxbz,order.getTjNumber(),order.getCardId(),
+ transitionService.updateTbTransitionById(transition.getId().toString(), jxbz, order.getTjNumber(), order.getCardId(),
transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
}
}
@@ -791,7 +804,7 @@
ArrayList<TjProject> jianChaProjects = new ArrayList<>();
- if(!projectList.isEmpty()){
+ if (!projectList.isEmpty()) {
List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
for (TjProject project : list) {
TjOrderRemark tjOrderRemark = new TjOrderRemark();
@@ -822,23 +835,23 @@
detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
// tjOrderDetails.add(detail1);
- if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) {
- if (null != project.getHisXmbm()) {
- jianChaProjects.add(project);
- }
+ if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) {
+ if (null != project.getHisXmbm()) {
+ jianChaProjects.add(project);
}
+ }
}
// TODO 鍜岀鍒扮櫥璁颁竴鏍� 鍙湁閰嶇疆涓殑浠ュ強鏀惰垂绫诲瀷涓轰綋妫�绁ㄦ椂鎵嶅鍔犲埌閲囨牱绠＄悊琛�
- if(config.equalsIgnoreCase("Y")){
+ if (config.equalsIgnoreCase("Y")) {
// if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
- List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
- addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
+ List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
+ addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
// }
- AjaxResult result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
- if (!result.get("code").toString().equals("200"))
- return false;
- }else {
+ AjaxResult result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
+ if (!result.get("code").toString().equals("200"))
+ return false;
+ } else {
List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
addCaiYangDengJiByDiaoYongShiTu(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
}
@@ -847,7 +860,7 @@
return true;
}
- public void addCaiYangDengJiByDiaoYongShiTu(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
+ 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();
@@ -893,9 +906,9 @@
}
}
String config = configService.selectConfigByKey("sfkqdyhis");
- if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
- if (ajaxResult.get("code").toString().equals("200")){
+ if (ajaxResult.get("code").toString().equals("200")) {
String str = ajaxResult.get("data").toString();
str = str.replace("=", ":");
JSONArray array = JSONUtil.parseArray(str);
@@ -907,12 +920,12 @@
lisJyflhb.setMc(object.getStr("mc"));
lisJyflhb.setFlbm(object.getStr("flbm"));
LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
+ wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
if (jyflhb == null) {
lisJyflhb.setId(IdUtil.getSnowflake().nextId());
lisJyflhbService.save(lisJyflhb);
- }else {
+ } else {
lisJyflhb.setId(jyflhb.getId());
lisJyflhbService.updateById(lisJyflhb);
}
@@ -920,13 +933,12 @@
}
}
- 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()));
}
}
-
//浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉�
@@ -1785,34 +1797,34 @@
// return AjaxResult.success();
// }
- public AjaxResult tijianbulushenqing(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
+ public AjaxResult tijianbulushenqing(TjCustomer customer, String date, String cardId, String jxbz, ArrayList<TjProject> jianChaProjects, Boolean isTuanTiPiao) {
TjOrder order = orderService.getOrderByCardId(cardId);
- if(null !=order){
+ if (null != order) {
String dept = configService.selectConfigByKey("request_default_dept");
String ysbm = configService.selectConfigByKey("request_default_ysbm");
String ysmc = configService.selectConfigByKey("request_default_ysmc");
String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
- List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
+ List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), cardId, jxbz);
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
- List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
+ List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos = new ArrayList<>();
if (useLisAndPacsRegister && isTuanTiPiao) {
// 妫�鏌ョ敵璇�
pacsReg(order, customer, jianChaProjects);
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getTjNum,order.getTjNumber());
- wrapper.eq(TjSampling::getJxbz,jxbz);
+ wrapper.eq(TjSampling::getTjNum, order.getTjNumber());
+ wrapper.eq(TjSampling::getJxbz, jxbz);
List<TjSampling> list = tjSamplingService.list(wrapper);
- log.info("閲囨牱鏁版嵁 ->{}",JSONUtil.toJsonStr(list));
- if (!list.isEmpty()){
+ log.info("閲囨牱鏁版嵁 ->{}", JSONUtil.toJsonStr(list));
+ if (!list.isEmpty()) {
Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
- log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
+ log.info("鍒嗙粍鍚� ->{}", JSONUtil.toJsonStr(listMap));
ArrayList<String> ids = new ArrayList<>();
for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
- log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
+ log.info("key ->{},val ->{}", entry.getKey(), entry.getValue());
// Lis鏍囨湰浠ｇ爜
String specimenTypeCode = entry.getKey();
List<TjSampling> samplings = entry.getValue();
- if (samplings.size() >= 2){
+ if (samplings.size() >= 2) {
// 杩涜鍚堝苟
List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
// log.info("鎻愬彇id ->{}",stringList);
@@ -1824,12 +1836,12 @@
}
}
if (stringList.size() > 1) {
- String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix);
+ String id = tjSamplingService.mergeCaiYangApi(stringList, lis_tmh_prefix);
ids.add(id);
- }else {
+ } else {
ids.add(stringList.get(0));
}
- }else {
+ } else {
ids.add(samplings.get(0).getId());
}
}
@@ -1837,7 +1849,7 @@
if (!confirmed)
return AjaxResult.error("澶勭悊澶辫触");
}
- }else {
+ } else {
List<TjOutpinmedicXm> outpinmedicXms = tjOutpinmedicXmService.list();
//妫�楠岀敵璇�
if (null != detailList && !detailList.isEmpty()) {
@@ -1845,14 +1857,14 @@
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
// wq.groupBy(TjProject::getHisXmbm);
// wq.in(TjProject::getDeptId, "241", "317");
- wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
+ wq.in(TjProject::getDeptId, deptService.getJyDeptIds());
List<TjProject> projects = projectService.list(wq);
if (null != projects && !projects.isEmpty()) {
List<TjProject> notNull = projects.stream().filter(i -> i.getSpecimenType() != null).collect(Collectors.toList());
List<TjProject> isNull = projects.stream().filter(i -> i.getSpecimenType() == null).collect(Collectors.toList());
Map<String, List<TjProject>> listMap = notNull.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
if (!isNull.isEmpty())
- listMap.put("",isNull);
+ listMap.put("", isNull);
for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) {
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(cardId);
@@ -1867,7 +1879,7 @@
List<TjProject> value = entry.getValue();
for (TjProject project : value) {
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getProParentId,project.getProId());
+ wrapper.eq(TjProject::getProParentId, project.getProId());
List<TjProject> list = projectService.list(wrapper);
for (TjProject tjProject : list) {
if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
@@ -1885,7 +1897,7 @@
}
if (!outpinmedicXms.isEmpty()) {
outpinmedicXms.stream().filter(i -> i.getProId().equals(project.getProId())).forEach(i -> {
- OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+ OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
detilsDto.setYpbm(i.getYpbm());
detilsDto.setPcbm(i.getPcbm());
detilsDto.setSl(i.getSl());
@@ -1968,15 +1980,15 @@
if (null != detailList && !detailList.isEmpty()) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
- wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
+ wq.in(TjProject::getDeptId, deptService.getJcDeptIds());
List<TjProject> projects = projectService.list(wq);
List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
- if (!proIds.isEmpty()){
+ if (!proIds.isEmpty()) {
QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
- wrapper4.select("sum(sl) as sl","pro_id"
- ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
- ,"pro_price");
- wrapper4.in("pro_parent_id",proIds);
+ wrapper4.select("sum(sl) as sl", "pro_id"
+ , "pro_parent_id", "pro_name", "his_xmbm", "his_xmmc"
+ , "pro_price");
+ wrapper4.in("pro_parent_id", proIds);
wrapper4.groupBy("his_xmbm");
projects = projectService.list(wrapper4);
if (null != projects && !projects.isEmpty()) {
@@ -1996,7 +2008,7 @@
List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
if (!outpinmedicXms.isEmpty()) {
outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
- OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+ OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
detilsDto.setYpbm(i.getYpbm());
detilsDto.setPcbm(i.getPcbm());
detilsDto.setSl(i.getSl());
@@ -2089,15 +2101,15 @@
if (null != detailList && !detailList.isEmpty()) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
- wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
+ wq.in(TjProject::getDeptId, deptService.getCzDeptIds());
List<TjProject> projects = projectService.list(wq);
List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
- if (!proIds.isEmpty()){
+ if (!proIds.isEmpty()) {
QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
- wrapper4.select("sum(sl) as sl","pro_id"
- ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
- ,"pro_price");
- wrapper4.in("pro_parent_id",proIds);
+ wrapper4.select("sum(sl) as sl", "pro_id"
+ , "pro_parent_id", "pro_name", "his_xmbm", "his_xmmc"
+ , "pro_price");
+ wrapper4.in("pro_parent_id", proIds);
wrapper4.groupBy("his_xmbm");
projects = projectService.list(wrapper4);
if (null != projects && !projects.isEmpty()) {
@@ -2115,7 +2127,7 @@
List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
if (!outpinmedicXms.isEmpty()) {
outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
- OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+ OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
detilsDto.setYpbm(i.getYpbm());
detilsDto.setPcbm(i.getPcbm());
detilsDto.setSl(i.getSl());
@@ -2186,8 +2198,8 @@
}
//鑽搧鐢宠
- if(!outpinmedicapplyDetilsDtos.isEmpty()){
- OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
+ if (!outpinmedicapplyDetilsDtos.isEmpty()) {
+ OutpinmedicapplyDto dto1 = new OutpinmedicapplyDto();
dto1.setHisRegistrationId(cardId);
dto1.setSfzh(customer.getCusIdcard());
dto1.setSqysbm(ysbm);
@@ -2204,13 +2216,13 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if(null !=code && code.equals("0")){
+ if (null != code && code.equals("0")) {
JSONObject resultData = object.getJSONObject("ResultData");
// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
String cfh = resultData.getStr("cfh");
- log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
+ log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: " + cfh + " outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: " + outpinmedicapplyDetilsDtos.toString());
for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
- TjCf cf=new TjCf();
+ TjCf cf = new TjCf();
cf.setJxbz(jxbz);
cf.setCardId(cardId);
cf.setSfzh(customer.getCusIdcard());
@@ -2516,12 +2528,12 @@
@Override
//@Async("async")
- public void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId, List<Long> proIds) {
+ public void saveRedisTransitionByPacId(String cusId, String cardId, Long pacId, List<Long> proIds) {
if (null != pacId) {
- transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId);
+ transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
}
if (null != proIds && proIds.size() > 0) {
- saveRedisTransitionByProId(cusId,cardId, proIds);
+ saveRedisTransitionByProId(cusId, cardId, proIds);
}
}
@@ -2619,26 +2631,13 @@
@Override
//@Async("async")
public void saveNewReservationConfirm(List<TjReservation> rightList) {
- if (null != rightList && rightList.size() > 0) {
+ if (null != rightList && !rightList.isEmpty()) {
//鍒涘缓绾跨▼姹�
- ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size());
+// ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size());
for (TjReservation reservation : rightList) {
//鍒犻櫎涔嬪墠鐨勬暟鎹�
transitionService.deletedTbTransitionByCusId(reservation.getIdCard());
- //鑾峰彇绾跨▼
- threadPool.execute(new Runnable() {
- @Override
- public void run() {
- try {
-// transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(), reservation.getGroupingId());
- transitionService.ttsaveTemoTransitionByGroupingId(reservation.getIdCard(),"0",reservation.getGroupingId());
-
- threadPool.shutdown();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
+ transitionService.ttsaveTemoTransitionByGroupingId(reservation.getIdCard(), "0", reservation.getGroupingId());
}
}
}
@@ -2756,20 +2755,19 @@
}
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
- addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser,null);
+ addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser, null);
}
-
//棣栭〉楗肩姸鍥剧櫥璁颁汉鏁版帴鍙�
private AjaxResult getPieCharts() {
Map<String, Object> map = new HashMap<>();
- Date date=new Date();
+ Date date = new Date();
//鑾峰彇浣撴鐧昏鏁�
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
- wq0.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
+ wq0.between(TjOrder::getCreateTime, DateUtil.offsetMonth(date, -1), date);
List<TjOrder> orderCountList = orderService.list(wq0);
if (null != orderCountList && !orderCountList.isEmpty()) {
List<PieChartVo> pieChartVoList = getTjorderCountMap(orderCountList);
@@ -2779,11 +2777,11 @@
}
//鑾峰彇浣撴寮傚父鏁�
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
+ wq1.between(TjOrder::getCreateTime, DateUtil.offsetMonth(date, -1), date);
// wq1.isNotNull(TjOrder::getFinishTime);
// wq1.eq(TjOrder::getCheckStatus, 1);
List<TjOrder> orderList = orderService.list(wq1);
- if (null !=orderList && !orderList.isEmpty()) {
+ if (null != orderList && !orderList.isEmpty()) {
// List<TjOrder> orderList = orderAbnormalCountList.stream().distinct().collect(Collectors.toList());
List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderList);
map.put("tjyc", pieChartVoList);
@@ -2859,7 +2857,7 @@
wq.eq(TjOrderDetail::getExceptionDesc, 1);
List<TjOrderDetail> list = tjOrderDetailService.list(wq);
int count = hysqdService.getHyYcXmCount(tjOrder.getCardId());
- if ((null != list && !list.isEmpty()) || (count>0)) {
+ if ((null != list && !list.isEmpty()) || (count > 0)) {
TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
if (null != customer) {
int age = DateUtil.ageOfNow(customer.getCusBrithday());
@@ -3631,13 +3629,13 @@
}
//涓存椂琛ㄦ坊鍔犲崟椤�
- public void saveRedisTransitionByProId(String cusId,String cardId, List<Long> proIds) {
+ public void saveRedisTransitionByProId(String cusId, String cardId, List<Long> proIds) {
for (Long proId : proIds) {
TjProject project = projectService.selectTjProjectByProId(proId);
- if(null !=project){ //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
+ if (null != project) { //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null == transitionList || transitionList.size() == 0) {
- transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
}
}
// if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
--
Gitblit v1.8.0