From 29c5eb14d235b431714d17b8043149a4c6bd688b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 十二月 2024 17:58:20 +0800
Subject: [PATCH] zjh202412025
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 587 +----------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 43 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 99 ---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 611 ++++++++++++------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 8
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 30 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 13
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 19
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 13
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 20
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 4
13 files changed, 491 insertions(+), 962 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index 28422ce..5bbd6c2 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -6,6 +6,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.service.*;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -64,8 +65,22 @@
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjFlowingWater::getHisWaterId, feiYongId);
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
- water.setPayStasus(1L);
- tjFlowingWaterService.updateById(water);
+ if(null !=water){
+ water.setPayStasus(1L);
+ if (tjFlowingWaterService.updateById(water)) {
+ String jxbz = water.getJxbz();
+ if(StringUtil.isNotBlank(jxbz)){
+ tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString());
+ remarkService.updateTjOrderRemarkSfbzByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString());
+ }else {
+ tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString());
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString());
+ }
+
+ }
+ }else {
+ return AjaxResult.error("鏌ヤ笉鍒版祦姘村彿: "+feiYongId);
+ }
}else {
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjFlowingWater::getHisTfWaterId, feiYongId).or().eq(TjFlowingWater::getHisWaterId, feiYongId);
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 a2de790..0896958 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
@@ -290,11 +290,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());
}
}
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());
}
if (tjFlowingWater.getDiscount() == null) {
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
@@ -341,8 +343,8 @@
@Override
@Async("async")
public void collectFees(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList, SysUser sysUser, String discount) {
- orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
- redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber());
+// orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
+// redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber());
for (TbTransition transition : tbTransitionList) {
// transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).divide(BigDecimal.valueOf(10))));
// transitionService.updateById(transition);
@@ -367,33 +369,33 @@
//鐖堕」
ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new));
List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList());
- if (parentProIds.size() > 0) {
+ if (!parentProIds.isEmpty()) {
for (Long parentProId : parentProIds) {
TjProject parentProject = projectService.selectTjProjectByProId(parentProId);
if (null != parentProject) {
LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
- if (null != proConsumables && proConsumables.size() > 0) {
+ if (null != proConsumables && !proConsumables.isEmpty()) {
for (TjProConsumables tjProConsumables : proConsumables) {
TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
list2.add(tjConsumables);
}
}
- TjOrderRemark tjOrderRemark = new TjOrderRemark();
- tjOrderRemark.setProId(parentProId);
- tjOrderRemark.setProName(parentProject.getProName());
- tjOrderRemark.setDeptId(parentProject.getDeptId());
- tjOrderRemark.setTjNumber(order.getTjNumber());
- tjOrderRemark.setCreateBy(sysUser.getNickName());
- tjOrderRemark.setCreateTime(new Date());
- tjOrderRemark.setUpdateBy(sysUser.getNickName());
- tjOrderRemark.setUpdateTime(new Date());
- tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
- tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
- orderRemarkService.save(tjOrderRemark);
- Map<String, Object> map = getOrderDetailByProParentId(String.valueOf(parentProId), order.getTjNumber());
- redisCache.setCacheMapValue("getOrderDetailByProParentId" + order.getTjNumber(), String.valueOf(parentProId), map);
+// TjOrderRemark tjOrderRemark = new TjOrderRemark();
+// tjOrderRemark.setProId(parentProId);
+// tjOrderRemark.setProName(parentProject.getProName());
+// tjOrderRemark.setDeptId(parentProject.getDeptId());
+// tjOrderRemark.setTjNumber(order.getTjNumber());
+// tjOrderRemark.setCreateBy(sysUser.getNickName());
+// tjOrderRemark.setCreateTime(new Date());
+// tjOrderRemark.setUpdateBy(sysUser.getNickName());
+// tjOrderRemark.setUpdateTime(new Date());
+// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+// orderRemarkService.save(tjOrderRemark);
+// Map<String, Object> map = getOrderDetailByProParentId(String.valueOf(parentProId), order.getTjNumber());
+// redisCache.setCacheMapValue("getOrderDetailByProParentId" + order.getTjNumber(), String.valueOf(parentProId), map);
}
}
}
@@ -416,11 +418,6 @@
chargingStandardService.save(tjChargingStandard);
}
-// LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
-// wq.isNotNull(TjOrderDetail::getFlowingWaterId);
-// wq.eq(TjOrderDetail::getIsSampling, 0);
-// List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null);
}
@@ -601,21 +598,9 @@
String config = configService.selectConfigByKey("sfkqdyhis");
-// //妫�楠�
-// List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
-//
-// //妫�鏌�
-// List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
-//
-//
-// //澶勭疆
-// List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
-//
-// List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
-
List<TjProject> projectList=new ArrayList<>();
- ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>();
+// ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>();
for (String tjProId : tjProIds) {
TjProject project = projectService.getById(Long.valueOf(tjProId));
if (null != project && project.getProParentId() == 0) {
@@ -665,130 +650,6 @@
tjOrderDetailService.save(detail1);
}
- if(null !=config && config.equals("Y")){
- //妫�楠�
-// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJyDeptIds().contains(project.getDeptId().toString())) {
-// if (null != project.getHisXmbm()) {
-// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-// detailsDto.setMxfyxmbm(project.getHisXmbm());
-// if (project.getSfzhfy().equals("Y")) {
-// detailsDto.setSfzhfy("1");
-// } else {
-// detailsDto.setSfzhfy("0");
-// }
-// detailsDto.setSl(project.getSl());
-// detailsDtos.add(detailsDto);
-// }
-// if(project.getProId()==1740177341251154377L){
-// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
-// detilsDto.setYpbm("00006670");
-// detilsDto.setPcbm("06");
-// detilsDto.setSl("1");
-// detilsDto.setDj("60");
-// detilsDto.setDcjl("1");
-// detilsDto.setPj("60");
-// detilsDto.setJj("60");
-// detilsDto.setJldw("");
-// detilsDto.setTjbm("");
-// detilsDto.setPs("");
-// detilsDto.setPsbm("");
-// detilsDto.setYyts("");
-// detilsDto.setXtph("");
-// detilsDto.setScph("");
-// detilsDto.setYpxq("");
-// detilsDto.setCdbm("");
-// detilsDto.setKfdw("");
-// detilsDto.setYfdw("");
-// detilsDto.setYysm("");
-// detilsDto.setFzbl("1");
-// detilsDto.setZh("0");
-// outpinmedicapplyDetilsDtos.add(detilsDto);
-// }
-// }
-
- //妫�鏌�
-
-// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) {
-// if (null != project.getHisXmbm()) {
-// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-// detailsDto.setMxfyxmbm(project.getHisXmbm());
-// if (project.getSfzhfy().equals("Y")) {
-// detailsDto.setSfzhfy("1");
-// } else {
-// detailsDto.setSfzhfy("0");
-// }
-// detailsDto.setSl(project.getSl());
-// detailsDtoss.add(detailsDto);
-// }
-// if(project.getProId()==1740177341251154377L){
-// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
-// detilsDto.setYpbm("00006670");
-// detilsDto.setPcbm("06");
-// detilsDto.setSl("1");
-// detilsDto.setDj("60");
-// detilsDto.setDcjl("1");
-// detilsDto.setPj("60");
-// detilsDto.setJj("60");
-// detilsDto.setJldw("");
-// detilsDto.setTjbm("");
-// detilsDto.setPs("");
-// detilsDto.setPsbm("");
-// detilsDto.setYyts("");
-// detilsDto.setXtph("");
-// detilsDto.setScph("");
-// detilsDto.setYpxq("");
-// detilsDto.setCdbm("");
-// detilsDto.setKfdw("");
-// detilsDto.setYfdw("");
-// detilsDto.setYysm("");
-// detilsDto.setFzbl("1");
-// detilsDto.setZh("0");
-// outpinmedicapplyDetilsDtos.add(detilsDto);
-// }
-// }
-
- //澶勭疆
-
-// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getCzDeptIds().contains(project.getDeptId().toString())) {
-// if (null != project.getHisXmbm()) {
-// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-// detailsDto.setMxfyxmbm(project.getHisXmbm());
-// if (project.getSfzhfy().equals("Y")) {
-// detailsDto.setSfzhfy("1");
-// } else {
-// detailsDto.setSfzhfy("0");
-// }
-// detailsDto.setSl(project.getSl());
-// detailDtos.add(detailsDto);
-// }
-// if(project.getProId()==1740177341251154377L){
-// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
-// detilsDto.setYpbm("00006670");
-// detilsDto.setPcbm("06");
-// detilsDto.setSl("1");
-// detilsDto.setDj("60");
-// detilsDto.setDcjl("1");
-// detilsDto.setPj("60");
-// detilsDto.setJj("60");
-// detilsDto.setJldw("");
-// detilsDto.setTjbm("");
-// detilsDto.setPs("");
-// detilsDto.setPsbm("");
-// detilsDto.setYyts("");
-// detilsDto.setXtph("");
-// detilsDto.setScph("");
-// detilsDto.setYpxq("");
-// detilsDto.setCdbm("");
-// detilsDto.setKfdw("");
-// detilsDto.setYfdw("");
-// detilsDto.setYysm("");
-// detilsDto.setFzbl("1");
-// detilsDto.setZh("0");
-// outpinmedicapplyDetilsDtos.add(detilsDto);
-// }
-// }
- }
-
} else {
//濡傛灉璇ラ」鐩瓨鍦� 鍒� 涓嶄繚瀛�
@@ -816,7 +677,7 @@
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
detail.setJxbz(jxbz);
tjOrderDetailService.save(detail);
- tjOrderDetails.add(detail);
+// tjOrderDetails.add(detail);
}
@@ -830,13 +691,9 @@
}
// TODO 鍜岀鍒扮櫥璁颁竴鏍� 鍙湁閰嶇疆涓殑浠ュ強鏀惰垂绫诲瀷涓轰綋妫�绁ㄦ椂鎵嶅鍔犲埌閲囨牱绠＄悊琛�
-// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz);
-// addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
-
- tjOrderDetails = new ArrayList<>();
+// tjOrderDetails = new ArrayList<>();
ArrayList<TjProject> jianChaProjects = new ArrayList<>();
-// ArrayList<TjProject> jianYanProjects = new ArrayList<>();
if(!projectList.isEmpty()){
List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
@@ -868,421 +725,33 @@
detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
- tjOrderDetails.add(detail1);
-// if(null !=config && config.equals("Y")){
- //妫�楠�
-// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJyDeptIds().contains(project.getDeptId().toString())) {
-// if (null != project.getHisXmbm()) {
-// jianYanProjects.add(project);
-// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-//
-// detailsDto.setMxfyxmbm(project.getHisXmbm());
-//
-// if (project.getSfzhfy().equals("Y")) {
-// detailsDto.setSfzhfy("1");
-// } else {
-// detailsDto.setSfzhfy("0");
-// }
-// detailsDto.setSl(project.getSl());
-// detailsDtos.add(detailsDto);
-// }
-// if(project.getProId()==1740177341251154377L){
-// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
-// detilsDto.setYpbm("00006670");
-// detilsDto.setPcbm("06");
-// detilsDto.setSl("1");
-// detilsDto.setDj("60");
-// detilsDto.setDcjl("1");
-// detilsDto.setPj("60");
-// detilsDto.setJj("60");
-// detilsDto.setJldw("");
-// detilsDto.setTjbm("");
-// detilsDto.setPs("");
-// detilsDto.setPsbm("");
-// detilsDto.setYyts("");
-// detilsDto.setXtph("");
-// detilsDto.setScph("");
-// detilsDto.setYpxq("");
-// detilsDto.setCdbm("");
-// detilsDto.setKfdw("");
-// detilsDto.setYfdw("");
-// detilsDto.setYysm("");
-// detilsDto.setFzbl("1");
-// detilsDto.setZh("0");
-// outpinmedicapplyDetilsDtos.add(detilsDto);
-// }
-// }
-
- //妫�鏌�
-
+// tjOrderDetails.add(detail1);
if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) {
if (null != project.getHisXmbm()) {
jianChaProjects.add(project);
-// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-// detailsDto.setMxfyxmbm(project.getHisXmbm());
-// if (project.getSfzhfy().equals("Y")) {
-// detailsDto.setSfzhfy("1");
-// } else {
-// detailsDto.setSfzhfy("0");
-// }
-// detailsDto.setSl(project.getSl());
-// detailsDtoss.add(detailsDto);
}
-// if(project.getProId()==1740177341251154377L){
-// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
-// detilsDto.setYpbm("00006670");
-// detilsDto.setPcbm("06");
-// detilsDto.setSl("1");
-// detilsDto.setDj("60");
-// detilsDto.setDcjl("1");
-// detilsDto.setPj("60");
-// detilsDto.setJj("60");
-// detilsDto.setJldw("");
-// detilsDto.setTjbm("");
-// detilsDto.setPs("");
-// detilsDto.setPsbm("");
-// detilsDto.setYyts("");
-// detilsDto.setXtph("");
-// detilsDto.setScph("");
-// detilsDto.setYpxq("");
-// detilsDto.setCdbm("");
-// detilsDto.setKfdw("");
-// detilsDto.setYfdw("");
-// detilsDto.setYysm("");
-// detilsDto.setFzbl("1");
-// detilsDto.setZh("0");
-// outpinmedicapplyDetilsDtos.add(detilsDto);
-// }
}
-
- //澶勭疆
-// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getCzDeptIds().contains(project.getDeptId().toString())) {
-// if (null != project.getHisXmbm()) {
-// OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-// detailsDto.setMxfyxmbm(project.getHisXmbm());
-// if (project.getSfzhfy().equals("Y")) {
-// detailsDto.setSfzhfy("1");
-// } else {
-// detailsDto.setSfzhfy("0");
-// }
-// detailsDto.setSl(project.getSl());
-// detailDtos.add(detailsDto);
-// }
-// if(project.getProId()==1740177341251154377L){
-// OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
-// detilsDto.setYpbm("00006670");
-// detilsDto.setPcbm("06");
-// detilsDto.setSl("1");
-// detilsDto.setDj("60");
-// detilsDto.setDcjl("1");
-// detilsDto.setPj("60");
-// detilsDto.setJj("60");
-// detilsDto.setJldw("");
-// detilsDto.setTjbm("");
-// detilsDto.setPs("");
-// detilsDto.setPsbm("");
-// detilsDto.setYyts("");
-// detilsDto.setXtph("");
-// detilsDto.setScph("");
-// detilsDto.setYpxq("");
-// detilsDto.setCdbm("");
-// detilsDto.setKfdw("");
-// detilsDto.setYfdw("");
-// detilsDto.setYysm("");
-// detilsDto.setFzbl("1");
-// detilsDto.setZh("0");
-// outpinmedicapplyDetilsDtos.add(detilsDto);
-// }
-// }
-// }
}
// TODO 鍜岀鍒扮櫥璁颁竴鏍� 鍙湁閰嶇疆涓殑浠ュ強鏀惰垂绫诲瀷涓轰綋妫�绁ㄦ椂鎵嶅鍔犲埌閲囨牱绠＄悊琛�
- if(config.equals("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);
}
}else {
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(order.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString());
+ orderRemarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString());
+
List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
addCaiYangDengJiByDiaoYongShiTu(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
}
-
}
-
-// Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
if(null !=config && config.equals("Y")){
AjaxResult result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
if (!result.get("code").toString().equals("200"))
return false;
-// if (useLisAndPacsRegister) {
-// List<TjProject> projectList2 = jianYanProjects.stream().distinct().collect(Collectors.toList());
- // 妫�鏌ョ敵璇�
-// pacsReg(order, customer, jianChaProjects);
-// }else {
-
-
- /* //妫�楠岀敵璇�
- if(!detailsDtos.isEmpty()){
- OutpintestapplyDto dto = new OutpintestapplyDto();
- dto.setHisRegistrationId(order.getCardId());
- dto.setSfzh(customer.getCusIdcard());
- dto.setSqysbm("00029");
- dto.setMzksbm("0101");
- dto.setSjrq(date);
- dto.setCzybm("00029");
- dto.setCzyksbm("0101");
- dto.setSfjz("0");
- dto.setDetails(detailsDtos.stream().distinct().collect(Collectors.toList()));
- AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
- String result5 = getAjaxResult(ajaxResult1);
- JSONObject object3 = getJSONObject(result5);
- String code3 = object3.getStr("ResultCode");
- if (code3.equals("0")) {
- List<OutpintestapplyDetailsDto> details = dto.getDetails();
- for (OutpintestapplyDetailsDto detail : details) {
- LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
- tree.setSfjx("Y");
- tree.setJxbz(jxbz);
- tree.setCardId(dto.getHisRegistrationId());
- LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
- wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
- tree.setPationid(tjCustomer.getPationId());
- JSONObject resultData = object3.getJSONObject("ResultData");
- tree.setSqdh(resultData.getStr("jysqdh"));
- tree.setFyhj(resultData.getStr("fyhj"));
- String mxfyxmbm = detail.getMxfyxmbm();
- tree.setHisXmdm(mxfyxmbm);
- tree.setType("妫�楠�");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- wrapper.eq(TjProject::getProParentId,0);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
- 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> wrapper2 = new LambdaQueryWrapper<>();
- wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
- LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
- LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
- wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
- LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
- tree.setXmfl(ejjfxmzd.getYjkmdm());
- }
- tree.setCreateTime(dates);
- ltkjJianchajianyanTreeService.save(tree);
- }
-
-// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
-// addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
-
- }
- }
-
- //闂ㄨ瘖妫�鏌ョ敵璇�
- if(!detailsDtoss.isEmpty()){
- OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
- outpinexamapplyDto.setHisRegistrationId(order.getCardId());
- outpinexamapplyDto.setSfzh(customer.getCusIdcard());
- outpinexamapplyDto.setSqysbm("00029");
- outpinexamapplyDto.setMzksbm("0101");
- outpinexamapplyDto.setCzybm("00029");
- outpinexamapplyDto.setCzyksbm("0101");
- outpinexamapplyDto.setSfjz("0");
- outpinexamapplyDto.setDetails(detailsDtoss.stream().distinct().collect(Collectors.toList()));
- AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
- String result6 = getAjaxResult(ajaxResult2);
- JSONObject object5 = getJSONObject(result6);
- String code4 = object5.getStr("ResultCode");
- if (code4.equals("0")) {
- List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
- for (OutpintestapplyDetailsDto detail : details) {
- LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
- tree.setSfjx("Y");
- tree.setJxbz(jxbz);
- tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
- LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
- wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
- tree.setPationid(tjCustomer.getPationId());
- JSONObject resultData = object5.getJSONObject("ResultData");
- tree.setSqdh(resultData.getStr("jcsqdh"));
- tree.setFyhj(resultData.getStr("fyhj"));
- String mxfyxmbm = detail.getMxfyxmbm();
- tree.setHisXmdm(mxfyxmbm);
- tree.setType("妫�鏌�");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- wrapper.eq(TjProject::getProParentId,0);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
- 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> wrapper2 = new LambdaQueryWrapper<>();
- wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
- LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
- LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
- wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
- LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
- tree.setXmfl(ejjfxmzd.getYjkmdm());
- }
- tree.setCreateTime(dates);
- ltkjJianchajianyanTreeService.save(tree);
- }
- }
- }*/
-// }
- /* //鑽搧鐢宠
- if(!outpinmedicapplyDetilsDtos.isEmpty()){
- OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
- dto1.setHisRegistrationId(order.getCardId());
- dto1.setSfzh(customer.getCusIdcard());
- dto1.setSqysbm("00029");
- dto1.setMzksbm("0101");
- dto1.setSjrq(date);
- dto1.setCzybm("00029");
- dto1.setCzyksbm("0101");
- dto1.setCflxbm("A");
- dto1.setYfbm("1");
- dto1.setFyts("1");
- dto1.setMzzd("");
- dto1.setDetails(outpinmedicapplyDetilsDtos);
- AjaxResult result = controller.Outpinmedicapply(dto1);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- 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");
-
- for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
- TjCf cf=new TjCf();
- cf.setCardId(order.getCardId());
- cf.setSfzh(customer.getCusIdcard());
- cf.setCfh(cfh);
- cf.setSqysbm("00029");
- cf.setSqysxm("鐜嬪仴钀�");
- cf.setMzksbn("0101");
- cf.setSqrq(date);
- cf.setCzybm("00029");
- cf.setYpbm(detilsDto.getYpbm());
- cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅");
- cf.setSl(String.valueOf(detilsDto.getSl()));
- cf.setDj(String.valueOf(detilsDto.getDj()));
- cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
- cf.setPj(String.valueOf(detilsDto.getPj()));
- cf.setJj(String.valueOf(detilsDto.getJj()));
- cf.setCreateTime(new Date());
- cf.setJxbz(jxbz);
- cfService.save(cf);
- }
- }
- }
-
- //闂ㄨ瘖娌荤枟澶勭疆鐢宠
- if(!detailDtos.isEmpty()){
- OutpintreatapplyDto dao = new OutpintreatapplyDto();
- dao.setHisRegistrationId(order.getCardId());
- dao.setSfzh(customer.getCusIdcard());
- dao.setSqysbm("00029");
- dao.setMzksbm("0101");
- dao.setSjrq(date);
- dao.setCzybm("00029");
- dao.setCzyksbm("0101");
- dao.setSfjz("0");
- dao.setDetails(detailDtos.stream().distinct().collect(Collectors.toList()));
- AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
- String mzylyzsq2 = getAjaxResult(mzylyzsq1);
- JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
- String code5 = mzylyzsq3.getStr("ResultCode");
- if (code5.equals("0")) {
- List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
- for (OutpintestapplyDetailsDto detail : details1) {
- LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
- tree.setSfjx("Y");
- tree.setJxbz(jxbz);
- tree.setCardId(dao.getHisRegistrationId());
- LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
- wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
- tree.setPationid(tjCustomer.getPationId());
- JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
- tree.setSqdh(resultData.getStr("zlczh"));
- tree.setFyhj(resultData.getStr("fyhj"));
- String mxfyxmbm = detail.getMxfyxmbm();
- tree.setHisXmdm(mxfyxmbm);
- tree.setType("澶勭疆");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- wrapper.eq(TjProject::getProParentId,0);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
- 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> wrapper2 = new LambdaQueryWrapper<>();
- wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
- LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
- LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
- wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
- LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
- tree.setXmfl(ejjfxmzd.getYjkmdm());
- }
- tree.setCreateTime(dates);
- ltkjJianchajianyanTreeService.save(tree);
- }
- }
- }*/
}
-
- //鐖堕」鑰楁潗
-// ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
-// for (TjConsumables tjConsumables : collect) {
-// TjChargingStandard tjChargingStandard = new TjChargingStandard();
-// tjChargingStandard.setTjNum(order.getTjNumber());
-// tjChargingStandard.setConsumablesId(tjConsumables.getId());
-// tjChargingStandard.setPrice(tjConsumables.getPrice());
-// tjChargingStandard.setProName(tjConsumables.getMakings());
-// tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
-// tjChargingStandard.setCompany(tjConsumables.getSpecifications());
-// tjChargingStandard.setCreateBy(sysUser.getNickName());
-// tjChargingStandard.setCreateTime(dates);
-// tjChargingStandard.setUpdateBy(sysUser.getNickName());
-// tjChargingStandard.setUpdateTime(dates);
-// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
-// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
-// chargingStandardService.save(tjChargingStandard);
-// }
return true;
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index a0e86ec..ecf1ca9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -107,7 +107,7 @@
@Autowired
private ITjRulesService tjRulesService;
@Autowired
- public RedisTemplate<Object,Object> redisTemplate;
+ public RedisTemplate<Object, Object> redisTemplate;
@Resource
private TestMapper testMapper;
@Autowired
@@ -124,9 +124,9 @@
@ApiOperation("鑾峰彇褰撳墠鐧诲綍浜哄搴旂殑闄㈠尯鍚�")
public AjaxResult getdangqiandengluyuanqu() {
Long deptId = SecurityUtils.getDeptId();
- if(null !=deptId){
+ if (null != deptId) {
SysDept dept = deptService.getById(deptId);
- if(null !=dept){
+ if (null != dept) {
String hospName = dept.getHospName();
return AjaxResult.success(hospName);
}
@@ -181,8 +181,8 @@
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
List<TjCustomer> customerLis = new ArrayList<>();
- if(null==name) name="";
- if(null==tjNumber) tjNumber="";
+ if (null == name) name = "";
+ if (null == tjNumber) tjNumber = "";
// //鏍规嵁浣撴鍙锋煡
// if (null != tjNumber) {
@@ -337,7 +337,7 @@
// .match(key).build();
// RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
// 0鏈,1宸叉
- Map<String,Object> map=null;
+ Map<String, Object> map = null;
if (type == 0) {
// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
// List<TjCustomer> customers = new ArrayList<>();
@@ -401,7 +401,7 @@
for (Long orderId : orderIds) {
if (null != orderId) {
TjOrder order = orderService.getById(orderId);
- if(null ==order){
+ if (null == order) {
continue;
}
if (type == 1) {
@@ -428,7 +428,7 @@
StringBuilder stringBuilder = new StringBuilder();
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
- if(null !=byId){
+ if (null != byId) {
stringBuilder.append(byId.getProName()).append(";");
}
}
@@ -457,10 +457,10 @@
@GetMapping("/huaYangetProList")
@ApiOperation("鍖栭獙妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult huaYangetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
- @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
+ @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
// String userId = SecurityUtils.getLoginUser().getUserId();
// Integer ksId = null;
// SysUser sysUser = null;
@@ -495,7 +495,7 @@
// }
// if(sysUser.getUserName().equals("10001")){
- ksproList = projectService.getHuaYanProId();
+ ksproList = projectService.getHuaYanProId();
// }
// else {
// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
@@ -801,7 +801,7 @@
// .match(key).build();
// RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
// 0鏈,1宸叉
- Map<String,Object> map=null;
+ Map<String, Object> map = null;
if (type == 0) {
// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
// List<TjCustomer> customers = new ArrayList<>();
@@ -847,10 +847,10 @@
@GetMapping("/yingXiangGetProList")
@ApiOperation("褰卞儚妫�鏌ラ〉闈㈠垪琛�")
public AjaxResult yingXiangGetProList(@ApiParam(value = "浣撴鍗曞彿") @RequestParam(required = false) String tjNumber,
- @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
+ @ApiParam(value = "0鏈,1宸叉") @RequestParam(defaultValue = "0") Integer type,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
/* String userId = SecurityUtils.getLoginUser().getUserId();
Integer ksId = null;
SysUser sysUser = null;
@@ -1043,7 +1043,7 @@
// }
// }
// List<TjCustomer> customerLists = null;
- Map<String,Object> map=null;
+ Map<String, Object> map = null;
if (type == 0) {
// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
// List<TjCustomer> customers = new ArrayList<>();
@@ -1103,7 +1103,7 @@
String format = DateUtil.format(patbirth, "yyyy.MM.dd");
- List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null);
+ List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname, sex, null);
return AjaxResult.success(tjYxjcList);
}
@@ -1118,9 +1118,6 @@
// List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null,null);
// return AjaxResult.success(tjYxjcList);
// }
-
-
-
/**
@@ -1294,9 +1291,9 @@
dept.setUpdateBy(getUsername());
//鏌ヨ闄㈠尯鍚嶅瓧璧嬪��
- if (dept.getHospId()!=null){
+ if (dept.getHospId() != null) {
final DictHosp byId = dictHospService.getById(dept.getHospId());
- if (byId!=null){
+ if (byId != null) {
dept.setHospName(byId.getHospAreaName());
}
}
@@ -1338,12 +1335,12 @@
}
for (TjOrderRemark orderRemark : remarklList) {
List<String> summaryList = orderRemark.getSummaryList();
- if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- }else {
+ } else {
orderRemark.setSummary(null);
}
- if(StringUtils.isBlank(orderRemark.getRemark()))orderRemark.setRemark(null);
+ if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
TjOrder order = orderService.getOne(qw);
@@ -1401,7 +1398,7 @@
one.setRemark(orderRemark.getRemark());
if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- }else {
+ } else {
one.setSummary(null);
}
one.setDoctorName(orderRemark.getDoctorName());
@@ -1409,13 +1406,13 @@
remarkService.updateById(one);
}
asyncService.updateCheckType(orderRemark.getTjNumber());
- asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
+ asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
// asyncService.updateCheckType(orderRemark.getTjNumber());
// asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
}
- remarkService.tjYishengjianchajianyi(null,null,null,null);
+ remarkService.tjYishengjianchajianyi(null, null, null, null);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -1442,343 +1439,343 @@
String configByKey = configService.selectConfigByKey("sfkqdyhis");
// 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
- if(null ==tjOrder){
+ if (null == tjOrder) {
return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
}
LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
- if(null !=tjFlowingWater){
- if(tjFlowingWater.getPayStasus()!=1 && tjFlowingWater.getPayStasus()!=3){
- if (configByKey.equals("Y")){
+ if (null != tjFlowingWater) {
+ if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
+ if (configByKey.equals("Y")) {
HashMap<String, Object> hisRequestParams = new HashMap<>();
// 涓嶅湪闇�瑕佽韩浠借瘉鍙�
- hisRequestParams.put("patientId",tjOrder.getCardId());
- log.info("ltkj--- "+DateUtil.date()+"鎿嶄綔浜篿d: "+userId+"鎿嶄綔绉戝: "+sysUser.getDeptId()+"鎿嶄綔鐨勪綋妫�浜�: "+tjNumber);
+ hisRequestParams.put("patientId", tjOrder.getCardId());
+ log.info("ltkj--- " + DateUtil.date() + "鎿嶄綔浜篿d: " + userId + "鎿嶄綔绉戝: " + sysUser.getDeptId() + "鎿嶄綔鐨勪綋妫�浜�: " + tjNumber);
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
- if (sfsf > 0){
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� "+sfsf);
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
+ if (sfsf > 0) {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
extracted(tjOrder, tjFlowingWater);
- }else {
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� "+tjOrder.getCardId()+" 浣撴鍙� "+tjOrder.getTjNumber());
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
}
- String s = configService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y")) {
- LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
- wrapper1.eq(TjFlowingWater::getPayStasus,0L);
- List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
- if (!list.isEmpty()){
- return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
- }
- }
+// String s = configService.selectConfigByKey("is_request_common_his_api");
+// if (null != s && s.equals("Y")) {
+// LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
+// wrapper1.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
+// wrapper1.eq(TjFlowingWater::getPayStasus, 0L);
+// List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
+// if (!list.isEmpty()) {
+// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+// }
+// }
}
- }else {
- log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈鎺is鎺ュ彛 "+" 浣撴鍙� "+tjOrder.getTjNumber());
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈鎺is鎺ュ彛 " + " 浣撴鍙� " + tjOrder.getTjNumber());
return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
String config = configService.selectConfigByKey("qt_open_xdt");
String byKey = configService.selectConfigByKey("qt_kjksid");
List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
- if("Y".equals(config)){
+ if ("Y".equals(config)) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
- if(null !=roles && roles.size()>0){
+ if (null != roles && !roles.isEmpty()) {
List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
- if(list.size()>0){
- if(null !=ksId && ksId==100){
- ksId=999;
- }
- if(null !=byKey && !"".equals(byKey)){
+ if (!list.isEmpty()) {
+// if (null != ksId && ksId == 100) {
+// ksId = 999;
+// }
+ if (null != byKey && !byKey.isEmpty()) {
String[] arr = byKey.split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
for (String s : arr) {
int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
}
}
- }else {
+ } else {
split.add(ksId);
}
- }else {
+ } else {
split.add(ksId);
}
- }else {
+ } else {
split.add(ksId);
}
- //鍒ゆ柇褰撳墠鐧婚檰鐨勪汉鏄笉鏄鐞嗗憳銆傜鐞嗗憳鍙互鐪嬪綋鍓嶄綋妫�鍙蜂笅鎵�鏈夐」鐩�
-// if (sysUser.getUserName().equals("10001")) {
-// QueryWrapper<TjOrderRemark> wqq = new QueryWrapper<>();
-// wqq.eq("tj_number", tjNumber);
-// List<TjOrderRemark> listq = remarkService.list(wqq);
-// if (listq.size() == 0) {
-// return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
-// }
-// for (TjOrderRemark tjOrderRemark : listq) {
-// TjProject tjProjectq = projectService.getById(tjOrderRemark.getProId());
-// if (null != tjProjectq) {
-// tjOrderRemark.setProName(tjProjectq.getProName());
-// }
-// }
-// return AjaxResult.success(listq);
+// LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
+// if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
+// wq2.in(TjProject::getDeptId,split);
// }
- LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
- if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
- wq2.in(TjProject::getDeptId,split);
- }
- //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- wq2.eq(TjProject::getNeedReport,"Y");
- List<TjProject> Deptlist = projectService.list(wq2);
- List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
- if (Deptlist.isEmpty() || proIdList.isEmpty()) {
- return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
- }
- LambdaQueryWrapper<TjOrder> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder one = orderService.getOne(wqqq);
- if (null != one) {
- LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
- wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
- wqq.in(TjOrderDetail::getProId, proIdList);
- wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
- List<TjOrderDetail> detailList = detailService.list(wqq);
- if (detailList != null && detailList.size() > 0) {
- List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
- QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
- wq.eq("tj_number", tjNumber);
- wq.in("pro_id", collect);
- wq.ne("type", 2);
- wq.ne("dept_id",241);
- wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
- List<TjOrderRemark> list = remarkService.list(wq);
- if (list.size() == 0) {
- return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
- }
- for (TjOrderRemark tjOrderRemark : list) {
- TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
- if (null != tjProject) {
- tjOrderRemark.setProName(tjProject.getProName());
- }
- }
- return AjaxResult.success(list);
+// //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+// wq2.eq(TjProject::getNeedReport,"Y");
+// List<TjProject> Deptlist = projectService.list(wq2);
+// List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
+// if (Deptlist.isEmpty() || proIdList.isEmpty()) {
+// return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
+// }
+
+
+ List<TjOrderRemark> list;
+ if(null != sysUser && sysUser.getUserName().equals("10001")){
+ list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ }else {
+ list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
}
- return AjaxResult.success();
- }
- return AjaxResult.error();
+
+ if (null ==list || list.isEmpty()) {
+ return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
+ }
+ for (TjOrderRemark tjOrderRemark : list) {
+ TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+ if (null != tjProject) {
+ tjOrderRemark.setProName(tjProject.getProName());
+ }
+ }
+
+ return AjaxResult.success(list);
+
+
+// LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
+// wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wqq.in(TjOrderDetail::getProId, proIdList);
+// wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
+// List<TjOrderDetail> detailList = detailService.list(wqq);
+// if (detailList != null && !detailList.isEmpty()) {
+// List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
+// QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
+// wq.eq("tj_number", tjNumber);
+// wq.in("pro_id", collect);
+// wq.ne("type", 2);
+// wq.ne("dept_id",241);
+// wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
+// List<TjOrderRemark> list = remarkService.list(wq);
+// if (list.isEmpty()) {
+// return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
+// }
+// for (TjOrderRemark tjOrderRemark : list) {
+// TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+// if (null != tjProject) {
+// tjOrderRemark.setProName(tjProject.getProName());
+// }
+// }
+// return AjaxResult.success(list);
+// }
+// return AjaxResult.success();
+// }
+
+}
+
+@Transactional
+public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId, tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId, detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
+}
+
+/**
+ * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
+ *
+ * @return
+ */
+@GetMapping("/getOrderDetailByProParentId")
+@ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
+public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
+ if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
+ return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
}
- @Transactional
- public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(0L);
- tjFlowingWater.setTollCollectorId("148");
- tjFlowingWaterService.updateById(tjFlowingWater);
- Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
- LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
- List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
- LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
- tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
- detailService.update(tjOrderDetailLambdaUpdateWrapper);
- }
+ TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- /**
- * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
- *
- * @return
- */
- @GetMapping("/getOrderDetailByProParentId")
- @ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
- public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
- @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
- if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
- return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
- }
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);
- TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
-
- List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
-
- if (null == proParentList || proParentList.isEmpty()) {
- Map<String, Object> map = new HashMap<>();
- map.put("xiaoJieIds", null);
- map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
- map.put("xiaoJie", null);
- map.put("remark", remark.getRemark());
- return AjaxResult.success(map);
- }
- List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
- TjOrder one = orderService.getOrderByTjNum(tjNumber);
- if (null == one) {
- return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
- }
- List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
- List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
-// TjCustomer customer = tjCustomerService.getById(one.getUserId());
- if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- TjProject project = projectService.getById(tjOrderDetail.getProId());
- //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- if ("N".equals(project.getNeedReport())){
- continue;
- }
- List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
- tjOrderDetail.setRulesList(rulesList);
- tjOrderDetail.setProject(project);
- if (null != remark.getDoctorName()) {
- SysUser byId = userService.getById(remark.getDoctorName());
- if (byId != null) {
- tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
- }
- } else {
- tjOrderDetail.setDoctorName(null);
- }
- tjOrderDetailList.add(tjOrderDetail);
- }
- }
+ if (null == proParentList || proParentList.isEmpty()) {
Map<String, Object> map = new HashMap<>();
- List<TjAdvice> adviceList = new ArrayList<>();
- if (null != remark) {
- String[] strings = StringUtils.split(remark.getSummary(), ";");
- if(null !=strings && strings.length>0){
- List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
- adviceList.addAll(list);
- }
- map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
- } else {
- map.put("xiaoJieIds", null);
- }
- map.put("sons", tjOrderDetailList);
- map.put("xiaoJie", adviceList);
+ map.put("xiaoJieIds", null);
+ map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId, proParentId)));
+ map.put("xiaoJie", null);
map.put("remark", remark.getRemark());
-
-// asyncService.getOrderDetailByProParentId(tjNumber,map,proParentId);
return AjaxResult.success(map);
}
-
- /**
- * 鐘舵�佷慨鏀�
- */
- @PutMapping("/changeStatus")
- @ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
- public AjaxResult changeStatus(@RequestBody SysDept dept) {
- //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
- if ("1".equals(dept.getStatus())) {
- //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
- LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
- wq.eq(SysUser::getDeptId, dept.getDeptId());
- List<SysUser> list = userService.list(wq);
- if (list.size() != 0) {
- return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
- }
- }
- dept.setUpdateBy(getUsername());
- int i = deptService.updateDeptStatus(dept);
- if (i == 0) {
- return AjaxResult.error("淇敼澶辫触");
- }
- return AjaxResult.success("淇敼鎴愬姛");
-
+ List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+ if (null == one) {
+ return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
}
+ List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
+ List<TjOrderDetail> tjOrderDetailList = new ArrayList<>();
+// TjCustomer customer = tjCustomerService.getById(one.getUserId());
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ TjProject project = projectService.getById(tjOrderDetail.getProId());
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ if ("N".equals(project.getNeedReport())) {
+ continue;
+ }
+ List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
+ tjOrderDetail.setRulesList(rulesList);
+ tjOrderDetail.setProject(project);
+ if (null != remark.getDoctorName()) {
+ SysUser byId = userService.getById(remark.getDoctorName());
+ if (byId != null) {
+ tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
+ }
+ } else {
+ tjOrderDetail.setDoctorName(null);
+ }
+ tjOrderDetailList.add(tjOrderDetail);
+ }
+ }
+ Map<String, Object> map = new HashMap<>();
+ List<TjAdvice> adviceList = new ArrayList<>();
+ if (null != remark) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if (null != strings && strings.length > 0) {
+ List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
+ adviceList.addAll(list);
+ }
+ map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
+ } else {
+ map.put("xiaoJieIds", null);
+ }
+ map.put("sons", tjOrderDetailList);
+ map.put("xiaoJie", adviceList);
+ map.put("remark", remark.getRemark());
+
+// asyncService.getOrderDetailByProParentId(tjNumber,map,proParentId);
+ return AjaxResult.success(map);
+}
+
+/**
+ * 鐘舵�佷慨鏀�
+ */
+@PutMapping("/changeStatus")
+@ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
+public AjaxResult changeStatus(@RequestBody SysDept dept) {
+ //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
+ if ("1".equals(dept.getStatus())) {
+ //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
+ LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
+ wq.eq(SysUser::getDeptId, dept.getDeptId());
+ List<SysUser> list = userService.list(wq);
+ if (!list.isEmpty()) {
+ return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
+ }
+ }
+ dept.setUpdateBy(getUsername());
+ int i = deptService.updateDeptStatus(dept);
+ if (i == 0) {
+ return AjaxResult.error("淇敼澶辫触");
+ }
+ return AjaxResult.success("淇敼鎴愬姛");
+
+}
- /**
- * 鏍规嵁椤圭洰id鑾峰彇寤鸿
- */
- @GetMapping("/getDeptAdvice")
- @ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
- public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
- @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
- @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
- @ApiParam(value = "椤电爜") @RequestParam(defaultValue ="1") int page,
- @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue ="10") int pageSize) {
- LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
- if(null !=proId){
- wq1.eq(TjAdvice::getProId, proId);
- }
- if(null !=nr && !nr.isEmpty()){
- wq1.like(TjAdvice::getTitle,nr);
- }else if (null !=pym && !pym.isEmpty()){
- wq1.like(TjAdvice::getTitle,pym);
- }
+/**
+ * 鏍规嵁椤圭洰id鑾峰彇寤鸿
+ */
+@GetMapping("/getDeptAdvice")
+@ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
+public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
+ @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
+ @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
+ @ApiParam(value = "椤电爜") @RequestParam(defaultValue = "1") int page,
+ @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue = "10") int pageSize) {
+ LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
+ if (null != proId) {
+ wq1.eq(TjAdvice::getProId, proId);
+ }
+ if (null != nr && !nr.isEmpty()) {
+ wq1.like(TjAdvice::getTitle, nr);
+ } else if (null != pym && !pym.isEmpty()) {
+ wq1.like(TjAdvice::getTitle, pym);
+ }
// else {
// wq1.last("limit 20");
// }
- Page<TjAdvice> pages=new Page<>(page,pageSize);
- Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
- Map<String,Object> map=new HashMap<>();
- map.put("list",advicePage.getRecords());
- map.put("total",advicePage.getTotal());
+ Page<TjAdvice> pages = new Page<>(page, pageSize);
+ Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", advicePage.getRecords());
+ map.put("total", advicePage.getTotal());
// List<TjAdvice> list = tjAdviceService.list(wq1);
- return AjaxResult.success(map);
- }
+ return AjaxResult.success(map);
+}
-
-
- @GetMapping("/getAdviceByTjNumAndPro")
- @ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
- public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
- @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
- LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderRemark::getProId, proId);
- wq.eq(TjOrderRemark::getTjNumber,tjNum);
- TjOrderRemark remark = remarkService.getOne(wq);
- List<TjAdvice> list =null;
- if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
- String[] strings = StringUtils.split(remark.getSummary(), ";");
- if(null !=strings && strings.length>0){
- list = tjAdviceService.getAdviceStringByIds(strings);
- }
+@GetMapping("/getAdviceByTjNumAndPro")
+@ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
+public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getProId, proId);
+ wq.eq(TjOrderRemark::getTjNumber, tjNum);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ List<TjAdvice> list = null;
+ if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if (null != strings && strings.length > 0) {
+ list = tjAdviceService.getAdviceStringByIds(strings);
}
- return AjaxResult.success(list);
}
+ return AjaxResult.success(list);
+}
+/**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
+//@PreAuthorize("@ss.hasPermi('system:dept:list')")
+@GetMapping("/deptTree")
+@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
+public AjaxResult deptTree(SysDept dept) {
+ return success(deptService.selectDeptTreeList(dept));
+}
- /**
- * 鑾峰彇閮ㄩ棬鏍戝垪琛�
- */
- //@PreAuthorize("@ss.hasPermi('system:dept:list')")
- @GetMapping("/deptTree")
- @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
- public AjaxResult deptTree(SysDept dept) {
- return success(deptService.selectDeptTreeList(dept));
+
+@GetMapping("/deptTree111")
+@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
+public AjaxResult deptTree111(SysDept dept) {
+ final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
+ return success(treeSelects);
+}
+
+
+/**
+ * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
+ */
+@GetMapping("/getChildList")
+@ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
+public AjaxResult getChildList(String deptName) {
+ LambdaQueryWrapper<SysDept> wq = new LambdaQueryWrapper<>();
+ wq.ne(SysDept::getParentId, 0);
+ if (deptName != null) {
+ wq.like(SysDept::getDeptName, deptName);
}
-
-
- @GetMapping("/deptTree111")
- @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
- public AjaxResult deptTree111(SysDept dept) {
- final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
- return success(treeSelects);
- }
-
-
- /**
- * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
- */
- @GetMapping("/getChildList")
- @ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
- public AjaxResult getChildList(String deptName) {
- LambdaQueryWrapper<SysDept> wq=new LambdaQueryWrapper<>();
- wq.ne(SysDept::getParentId,0);
- if (deptName!=null){
- wq.like(SysDept::getDeptName,deptName);
- }
- List<SysDept> depts = deptService.list(wq);
- return success(depts);
- }
+ List<SysDept> depts = deptService.list(wq);
+ return success(depts);
+}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 47c114f..1fff389 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -637,6 +637,6 @@
@DeleteMapping("/{cusIds}")
@ApiOperation(value = "鍒犻櫎瀹㈡埛")
public AjaxResult remove(@PathVariable @ApiParam(value = "鎵�鍒犻櫎瀹㈡埛鐨刬d") Long[] cusIds) {
- return toAjax(tjCustomerService.deleteTjCustomerByCusIds(cusIds));
+ return toAjax(tjCustomerService.removeByIds(Arrays.asList(cusIds)));
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 3065dac..1d1afe6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -323,24 +323,26 @@
return AjaxResult.success("璇ヨ鍗曞凡浠樻 鏃犻』鍐嶄粯");
}
if (tjFlowingWaterService.updateById(tjFlowingWater)) {
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId());
- wq2.isNull(TjOrderDetail::getFlowingWaterId);
+// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId());
+// wq2.isNull(TjOrderDetail::getFlowingWaterId);
List<TjConsumables> list2 = new ArrayList<>();
- for (TjOrderDetail tjOrderDetail : detailService.list(wq2)) {
- tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- detailService.updateById(tjOrderDetail);
- }
+// for (TjOrderDetail tjOrderDetail : detailService.list(wq2)) {
+// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// detailService.updateById(tjOrderDetail);
+// }
+ detailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String.valueOf(order.getOrderId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
LambdaQueryWrapper<TjOrderDetail> wq3 = new LambdaQueryWrapper<>();
wq3.eq(TjOrderDetail::getOrderId, tjFlowingWater.getOrderId());
wq3.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq3);
- if (null != detailList && detailList.size() > 0) {
+ if (null != detailList && !detailList.isEmpty()) {
LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
wqq.in(TbTransition::getProId, detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()));
List<TbTransition> tbTransitionList = transitionService.list(wqq);
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
+ if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
// extracted(order, list2, tbTransitionList);
//寮傛娣诲姞鏀惰垂鏄庣粏
asyncService.collectFees(order, list2, tbTransitionList, sysUser, tjFlowingWater.getDiscount());
@@ -501,19 +503,19 @@
.or()
.like(TjCustomer::getCusPhone, tjPhone);
List<TjCustomer> customerList = customerService.list(wq0);
- if (null != customerList && customerList.size() > 0) {
+ if (null != customerList && !customerList.isEmpty()) {
for (TjCustomer customer : customerList) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjOrder::getUserId, customer.getCusId());
wq1.eq(TjOrder::getCheckStatus, 0);
wq1.orderByDesc(TjOrder::getCreateTime);
List<TjOrder> tjOrders = orderService.list(wq1);
- if (null != tjOrders && tjOrders.size() > 0) {
+ if (null != tjOrders && !tjOrders.isEmpty()) {
for (TjOrder order : tjOrders) {
LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
List<TjOrderDetail> detailList = detailService.list(wq2);
- if (null != detailList && detailList.size() > 0) {
+ if (null != detailList && !detailList.isEmpty()) {
TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
tjRefundVo.setTjName(customer.getCusName());
@@ -540,39 +542,6 @@
}
}
}
- // TjOrder order = null;
-// if (null != tjOrders && tjOrders.size() > 0) {
-// order = tjOrders.get(0);
-// }
-// if (null == order) {
-// continue;
-// }
-// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
-// wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
-// List<TjOrderDetail> detailList = detailService.list(wq2);
-// if (null != detailList && detailList.size() > 0) {
-// TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
-// tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
-// tjRefundVo.setTjName(customer.getCusName());
-// tjRefundVo.setTjPhone(customer.getCusPhone());
-// tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
-// tjRefundVo.setIdCard(customer.getCusIdcard());
-// if (null != order.getDictCompName())
-// tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
-// if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
-// LambdaQueryWrapper<TjFlowingWater> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjFlowingWater::getOrderId, order.getOrderId());
-// wq.eq(TjFlowingWater::getIsAddition, "N");
-// wq.eq(TjFlowingWater::getPayStasus, 0);
-// TjFlowingWater one = tjFlowingWaterService.getOne(wq);
-//// if (null == one) {
-//// return AjaxResult.success("涓嶅彲閲嶅鏀惰垂");
-//// }
-// tjRefundVo.setTjFlowingWater(one);
-// tjRefundVo.setTjNumber(order.getTjNumber());
-// tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
-// tjCollectFeesVoList.add(tjRefundVo);
-// }
}
return AjaxResult.success(tjCollectFeesVoList);
}
@@ -584,13 +553,13 @@
wq1.likeLeft(TjOrder::getTjNumber, tjNum);
// wq1.eq(TjOrder::getCheckStatus, 0);
List<TjOrder> orderList = orderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
for (TjOrder order : orderList) {
LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
//wq2.isNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq2);
- if (null != detailList && detailList.size() > 0) {
+ if (null != detailList && !detailList.isEmpty()) {
TjCustomer customer = customerService.getById(order.getUserId());
if (null != customer) {
TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
@@ -643,39 +612,9 @@
}
String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId());
String s = tjFlowingWaterService.getDiscount(OrderId);
- if (null != tjProjectList && tjProjectList.size() > 0) {
+ if (null != tjProjectList && !tjProjectList.isEmpty()) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
-/* //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
-// wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
-// wqq1.eq(TbTransition::getParentProId, project.getProId());
-// List<TbTransition> tbTransitionList = transitionService.list(wqq1);
-// BigDecimal bigDecimal = new BigDecimal("0.00");
-// BigDecimal bigDecimal1 = new BigDecimal("0.00");
-// for (TbTransition transition : tbTransitionList) {
-// bigDecimal = bigDecimal.add(transition.getNowPrice());
-// bigDecimal1=bigDecimal1.add(transition.getOrdPrice());
-// }
-// project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP));
-// project.setProOrdPrice(bigDecimal1);
- BigDecimal decimal = transitionService.getTbTransitionPriceAndOrdPrice(customerService.getById(order.getUserId()).getCusIdcard(),
- project.getProId());
- String s = tjFlowingWaterService.getDiscount(OrderId);
- if(null !=decimal){
-// project.setProPrice(decimal.setScale(2));
- project.setProPrice(decimal);
-// project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
- project.setProOrdPrice(decimal);
- }else {
- BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
- if(null !=decimal1){
- project.setProPrice(decimal1.setScale(2));
- project.setProOrdPrice(decimal1.multiply(new BigDecimal(s)).setScale(2));
- }else {
- project.setProPrice(new BigDecimal("0.00").setScale(2));
- project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
- }
- }*/
if (null != pacId) {
TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
.eq(TjPackageProject::getProId, String.valueOf(project.getProId())));
@@ -696,9 +635,9 @@
List<TjFlowingWater> list = tjFlowingWaterService.list(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, order)
.eq(TjFlowingWater::getPayStasus, 2));
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
List<TjProject> projectList = projectService.getTjProListByPacIdAndDeptId(pacId);
- if(null !=projectList && projectList.size()>0){
+ if(null !=projectList && !projectList.isEmpty()){
for (TjProject project : projectList) {
project.setProOrdPrice(tjPackageProjectService.getPacProPriceByPacIdAndPro(project.getProId(),pacId)
.multiply(new BigDecimal(s)).setScale(2));
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index e237f9c..d764531 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1233,7 +1233,6 @@
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
-
String s = configService.selectConfigByKey("is_request_common_his_api");
if (null != s && s.equals("Y")) {
String apiUrl = configService.selectConfigByKey("common_api_url");
@@ -1290,7 +1289,7 @@
JSONObject data = object.getJSONObject("data");
tjFlowingWater.setHisWaterId(data.getStr("feiYongId"));
JSONArray mxList = data.getJSONArray("mxList");
- if (mxList != null && mxList.size() > 0) {
+ if (mxList != null && !mxList.isEmpty()) {
List<TjFlowingWaterHis> his = mxList.toList(TjFlowingWaterHis.class);
tjFlowingWaterHisService.saveBatch(his);
}
@@ -1310,7 +1309,7 @@
// if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
-
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
@@ -2586,6 +2585,7 @@
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
}
}
if (tjFlowingWater.getPayStasus() == 1L) {
@@ -2595,6 +2595,7 @@
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPayType(4L);
tjFlowingWaterService.updateById(tjFlowingWater);
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
}
}
@@ -2657,11 +2658,13 @@
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.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()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
}
if (tjFlowingWater.getDiscount() == null) {
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
@@ -2926,6 +2929,7 @@
ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(TjFlowingWater::getOrderId, order.getOrderId());
+ wrapper1.orderByDesc(TjFlowingWater::getJxbz);
List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjCustomer::getCusId,order.getUserId());
@@ -3045,7 +3049,7 @@
remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
- transitionService.updateTbTransitionByTjNum(order.getTjNumber());
+// transitionService.updateTbTransitionByTjNum(order.getTjNumber());
}
}
for (String id : reservationIds) {
@@ -3158,7 +3162,7 @@
@GetMapping("/revokeTjOrderByTjh")
- @ApiOperation(value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
+ @ApiOperation(value = "寮哄埗鎾ら攢鎺ュ彛鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
@Transactional
public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
@@ -3168,11 +3172,13 @@
// if (null != payByTjNum) {
// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
// }
+ //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
}
return AjaxResult.success();
}
@@ -3217,7 +3223,7 @@
// @Transactional
public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
- if (null == dto.getBldhs() || dto.getBldhs().size() == 0) {
+ if (null == dto.getBldhs() || dto.getBldhs().isEmpty()) {
log.info("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
}
@@ -3309,7 +3315,7 @@
map.put("cardId", tjCustomer.getHisJzkh());
map.put("tjNum", water.getTjSerialNumber());
map.put("kaiDanKs","7805");
- // 鏀惰垂鏍囧織 1寰呭敭璐� 2寰呴��璐�
+ // 鏀惰垂鏍囧織 1寰呮敹璐� 2寰呴��璐�
map.put("shouTuiStatus","2");
JSONArray array = JSONUtil.createArray();
String bldh = water.getJxbz();
@@ -3400,12 +3406,23 @@
if (isDelete) {
for (TjFlowingWater water : weizhifu) {
String bldh = water.getJxbz();
- remarkService.deleteTjOrderDetailByjxbz(bldh);
- tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
- tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
- transitionService.deleteTjOrderDetailByjxbz(bldh);
- blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh));
- tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh);
+ if(StrUtil.isNotBlank(bldh)){
+ remarkService.deleteTjOrderDetailByjxbz(bldh);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
+ transitionService.deleteTjOrderDetailByjxbz(bldh);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh));
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh);
+ }else {
+ //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNum);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(tjNum);
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+ }
+
}
}
} else return AjaxResult.error();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
index 6f62445..381eddc 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
@@ -121,6 +121,10 @@
private String jxbz;
+ @ApiModelProperty(value = "鏀惰垂鏍囧織")
+ private String sfbz;
+
+
@ApiModelProperty(value = "椤圭洰绫诲埆")
@TableField(exist = false)
private String xmlb;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index e406c81..a87e5a8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -254,4 +254,17 @@
@Select("call tj_check_yclist(4,#{tjNumber,mode=IN})")
List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu4(@Param("tjNumber") String tjNumber);
+
+ @Update("UPDATE tj_order_detail a SET\n" +
+ "a.flowing_water_id=#{ls} ,\n" +
+ "a.update_time=SYSDATE()\n" +
+ "WHERE a.order_id=#{orderId} and a.jxbz=#{jxbz}")
+ void updateTjOrderDetailsFlowingWaterIdByJxbz(@Param("orderId") String orderId, @Param("jxbz")String jxbz,@Param("ls")String ls);
+
+
+ @Update("UPDATE tj_order_detail a SET\n" +
+ "a.flowing_water_id=#{ls} ,\n" +
+ "a.update_time=SYSDATE()\n" +
+ "WHERE a.order_id=#{orderId} and isnull(a.jxbz)")
+ void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(@Param("orderId") String orderId,@Param("ls")String ls);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 637d437..0fc7a63 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -194,4 +194,34 @@
@Select("SELECT COUNT(*) a FROM tj_order_remark a WHERE a.deleted=0 AND a.tj_number=#{tjNum} AND a.type in(0,3);")
int panduaniswancheng(String tjNum);
+
+ @Update("\n" +
+ "UPDATE tj_order_remark a JOIN tj_order b ON b.tj_number=a.tj_number\n" +
+ "SET\n" +
+ " a.sfbz=#{ls}\n" +
+ "WHERE b.order_id=#{orderId} AND a.jxbz=#{jxbz}")
+ void updateTjOrderRemarkSfbzByJxbz(@Param("orderId") String orderId,@Param("jxbz") String jxbz,@Param("ls") String ls);
+
+
+ @Update("\n" +
+ "UPDATE tj_order_remark a JOIN tj_order b ON b.tj_number=a.tj_number\n" +
+ "SET\n" +
+ " a.sfbz=#{ls}\n" +
+ "WHERE b.order_id=#{orderId} AND ISNULL(a.jxbz)")
+ void updateTjOrderRemarkSfbzByJxbzisnull(@Param("orderId") String orderId,@Param("ls") String ls);
+
+
+ @Select({"<script>", "SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id ",
+ " WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
+ "<foreach collection='split' item='id' open='(' separator=',' close=')'>",
+ "#{id}",
+ "</foreach>",
+ "</script>" })
+ List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") List<Integer> split);
+
+
+ @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
+ "\n" +
+ "WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
+ List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index efc562c..5b56df5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -125,4 +125,8 @@
List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber);
List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(int num,String tjNumber);
+
+ void updateTjOrderDetailsFlowingWaterIdByJxbz(String orderId, String jxbz,String ls);
+
+ void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String orderId,String ls);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index c5bfd77..a44adcb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -78,4 +78,12 @@
int panduaniscunzaiweijian(String tjNum);
int panduaniswancheng(String tjNum);
+
+ void updateTjOrderRemarkSfbzByJxbz(String orderId, String jxbz, String ls);
+
+ void updateTjOrderRemarkSfbzByJxbzisnull(String orderId, String ls);
+
+ List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber,List<Integer> split);
+
+ List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index f2ae3fc..2a9d878 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -207,8 +207,21 @@
return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
}
+
+
@Override
public List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber) {
return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
}
+
+
+ @Override
+ public void updateTjOrderDetailsFlowingWaterIdByJxbz(String orderId, String jxbz,String ls) {
+ tjOrderDetailMapper.updateTjOrderDetailsFlowingWaterIdByJxbz(orderId,jxbz,ls);
+ }
+
+ @Override
+ public void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String orderId,String ls) {
+ tjOrderDetailMapper.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(orderId,ls);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 9a9ab86..31f0b7c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -156,4 +156,24 @@
return mapper.panduaniswancheng(tjNum);
}
+ @Override
+ public void updateTjOrderRemarkSfbzByJxbz(String orderId, String jxbz, String ls) {
+ mapper.updateTjOrderRemarkSfbzByJxbz(orderId,jxbz,ls);
+ }
+
+ @Override
+ public void updateTjOrderRemarkSfbzByJxbzisnull(String orderId, String ls) {
+ mapper.updateTjOrderRemarkSfbzByJxbzisnull(orderId,ls);
+ }
+
+ @Override
+ public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, List<Integer> split) {
+ return mapper.yiShengJianChaGetPrentPro(tjNumber,split);
+ }
+
+ @Override
+ public List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(String tjNumber) {
+ return mapper.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ }
+
}
--
Gitblit v1.8.0