From 3844954e02e67611fd57dafa236ee2c20e258b78 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 11 九月 2024 18:02:02 +0800
Subject: [PATCH] zjh20240911
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 480 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 343 insertions(+), 137 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 40d99f3..2022c2e 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
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,10 +14,7 @@
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
-import com.ltkj.hosp.hisDto.OutpinexamapplyDto;
-import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto;
-import com.ltkj.hosp.hisDto.OutpintestapplyDto;
-import com.ltkj.hosp.hisDto.OutpintreatapplyDto;
+import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.AddNewReservationConfirm;
import com.ltkj.hosp.vodomain.LineChartsVo;
@@ -24,6 +22,7 @@
import com.ltkj.hosp.vodomain.QjDomainVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
@@ -122,6 +121,16 @@
private LtkjEjjfxmzdService ltkjEjjfxmzdService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+ @Autowired
+ private TjProBlService blService;
+ @Resource
+ private ITjFlowingWaterService tjFlowingWaterService;
+ @Resource
+ private ISysDeptService deptService;
+ @Autowired
+ private TjCfService cfService;
+ @Resource
+ private LtkjHysqdService hysqdService;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
@@ -149,7 +158,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()));
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
//淇敼姣忛」鐨勫師浠风幇浠�
for (TbTransition transition : tbTransitionList) {
@@ -201,7 +210,8 @@
public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
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()));
+ boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
+ 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.size() > 0) {
@@ -269,7 +279,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()));
+ 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) {
@@ -493,11 +503,25 @@
@Override
@Async("async")
- @Transactional
+// @Transactional
public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
- List<TjConsumables> list2 = new ArrayList<>();
+
+ String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();
+
+ tjFlowingWater.setJxbz(jxbz);
+ tjFlowingWaterService.updateById(tjFlowingWater);
+
+ TjProBl proBl=new TjProBl();
+ proBl.setTjh(order.getTjNumber());
+ proBl.setBldh(jxbz);
+ proBl.setBlsj(date);
+ proBl.setBlrdm(sysUser.getUserName());
+ proBl.setBlrmc(sysUser.getNickName());
+ proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn()));
+ blService.save(proBl);
+
String[] tjProIds = tjFlowingWater.getTjProIds();
String config = configService.selectConfigByKey("sfkqdyhis");
@@ -512,12 +536,14 @@
//澶勭疆
List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
+ List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
List<TjProject> projectList=new ArrayList<>();
for (String tjProId : tjProIds) {
- LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+// LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+// wqq.isNull(TbTransition::getTjNum);
TjProject project = projectService.getById(Long.valueOf(tjProId));
if (null != project && project.getProParentId() == 0) {
TjOrderRemark tjOrderRemark = new TjOrderRemark();
@@ -531,6 +557,7 @@
tjOrderRemark.setUpdateTime(dates);
tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
@@ -546,6 +573,7 @@
detail.setUpdateTime(dates);
detail.setCreateId(String.valueOf(sysUser.getUserId()));
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail.setJxbz(jxbz);
tjOrderDetailService.save(detail);
for (Long proId : proIds) {
TjOrderDetail detail1 = new TjOrderDetail();
@@ -554,19 +582,21 @@
// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
detail1.setProId(proId);
detail1.setIsAddition("Y");
- detail.setCreateBy(sysUser.getNickName());
- detail.setCreateTime(dates);
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(dates);
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setCreateBy(sysUser.getNickName());
+ detail1.setCreateTime(dates);
+ detail1.setUpdateBy(sysUser.getNickName());
+ detail1.setUpdateTime(dates);
+ detail1.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
}
- wqq.in(TbTransition::getProId, proIds);
+// wqq.in(TbTransition::getProId, proIds);
if(null !=config && config.equals("Y")){
//妫�楠�
- if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L || project.getDeptId() == 317L)) {
+// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L || project.getDeptId() == 317L)) {
+ 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());
@@ -578,14 +608,40 @@
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 &&
- (project.getDeptId() == 247 || project.getDeptId() == 248 || project.getDeptId() == 249 ||
- project.getDeptId() == 250 || project.getDeptId() == 251 || project.getDeptId() == 252 ||
- project.getDeptId() == 271 || project.getDeptId() == 273 || project.getDeptId() == 274 ||
- project.getDeptId() == 275 || project.getDeptId() == 298)) {
+// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
+// (project.getDeptId() == 247 || project.getDeptId() == 248 || project.getDeptId() == 249 ||
+// project.getDeptId() == 250 || project.getDeptId() == 251 || project.getDeptId() == 252 ||
+// project.getDeptId() == 271 || project.getDeptId() == 273 || project.getDeptId() == 274 ||
+// project.getDeptId() == 275 || project.getDeptId() == 298)) {
+ 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());
@@ -597,14 +653,40 @@
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 &&
- (project.getDeptId() == 100 || project.getDeptId() == 240 || project.getDeptId() == 253 ||
- project.getDeptId() == 254 || project.getDeptId() == 255 || project.getDeptId() == 257 ||
- project.getDeptId() == 258 || project.getDeptId() == 259 || project.getDeptId() == 269 ||
- project.getDeptId() == 270)) {
+// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
+// (project.getDeptId() == 100 || project.getDeptId() == 240 || project.getDeptId() == 253 ||
+// project.getDeptId() == 254 || project.getDeptId() == 255 || project.getDeptId() == 257 ||
+// project.getDeptId() == 258 || project.getDeptId() == 259 || project.getDeptId() == 269 ||
+// project.getDeptId() == 270)) {
+ 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());
@@ -616,13 +698,38 @@
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 {
- wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
+// wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
TjProject projectss = projectService.getById(projects.getProParentId());
@@ -630,11 +737,9 @@
projectList.add(projectss);
}
}
-// List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
TjOrderDetail detail = new TjOrderDetail();
detail.setTjStatus(0L);
detail.setOrderId(tjFlowingWater.getOrderId());
-// detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
detail.setProId(Long.valueOf(tjProId));
detail.setIsAddition("Y");
detail.setCreateBy(sysUser.getNickName());
@@ -643,66 +748,28 @@
detail.setUpdateTime(dates);
detail.setCreateId(String.valueOf(sysUser.getUserId()));
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail.setJxbz(jxbz);
tjOrderDetailService.save(detail);
}
- List<TbTransition> tbTransitionList = transitionService.list(wqq);
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
+// List<TbTransition> tbTransitionList = transitionService.list(wqq);
+ List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(),tjProId);
+ if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
for (TbTransition transition : tbTransitionList) {
- transition.setTjNum(order.getTjNumber());
- transition.setCardId(order.getCardId());
- transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
- transitionService.updateById(transition);
- TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
- //瀛愰」
- if (null != tjProject) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setProId(transition.getProId());
- tjChargingStandard.setPrice(transition.getNowPrice());
- tjChargingStandard.setProName(tjProject.getProName());
- 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);
- }
- }
- //鐖堕」
-
- TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
- if (null != parentProject && parentProject.getProParentId() == 0) {
- LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
- List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
- if (null != proConsumables && proConsumables.size() > 0) {
- for (TjProConsumables tjProConsumables : proConsumables) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- list2.add(tjConsumables);
- }
- }
-
- } else {
- TjProject parentProjects = projectService.getById(tjProId);
- if (null != parentProjects) {
- LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
- List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
- if (null != proConsumables && proConsumables.size() > 0) {
- for (TjProConsumables tjProConsumables : proConsumables) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- list2.add(tjConsumables);
- }
- }
- }
+// transition.setJxbz(jxbz);
+// transition.setTjNum(order.getTjNumber());
+// transition.setCardId(order.getCardId());
+// transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
+// transitionService.updateById(transition);
+ transitionService.updateTbTransitionById(transition.getId().toString(),jxbz,order.getTjNumber(),order.getCardId(),
+ transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
}
}
+
}
- if(projectList.size()>0){
+ if(!projectList.isEmpty()){
List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
for (TjProject project : list) {
TjOrderRemark tjOrderRemark = new TjOrderRemark();
@@ -716,12 +783,12 @@
tjOrderRemark.setUpdateTime(dates);
tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
TjOrderDetail detail1 = new TjOrderDetail();
detail1.setTjStatus(0L);
detail1.setOrderId(tjFlowingWater.getOrderId());
-// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
detail1.setProId(project.getProId());
detail1.setIsAddition("Y");
detail1.setCreateBy(sysUser.getNickName());
@@ -730,10 +797,12 @@
detail1.setUpdateTime(dates);
detail1.setCreateId(String.valueOf(sysUser.getUserId()));
detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
if(null !=config && config.equals("Y")){
//妫�楠�
- if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L || project.getDeptId() == 317L)) {
+// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L || project.getDeptId() == 317L)) {
+ if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJyDeptIds().contains(project.getDeptId().toString())) {
if (null != project.getHisXmbm()) {
OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
@@ -747,14 +816,40 @@
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 &&
- (project.getDeptId() == 247L || project.getDeptId() == 248L || project.getDeptId() == 249L ||
- project.getDeptId() == 250L || project.getDeptId() == 251L || project.getDeptId() == 252L ||
- project.getDeptId() == 271L || project.getDeptId() == 273L || project.getDeptId() == 274L ||
- project.getDeptId() == 275L || project.getDeptId() == 298L)) {
+// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
+// (project.getDeptId() == 247L || project.getDeptId() == 248L || project.getDeptId() == 249L ||
+// project.getDeptId() == 250L || project.getDeptId() == 251L || project.getDeptId() == 252L ||
+// project.getDeptId() == 271L || project.getDeptId() == 273L || project.getDeptId() == 274L ||
+// project.getDeptId() == 275L || project.getDeptId() == 298L)) {
+ 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());
@@ -766,14 +861,40 @@
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 &&
- (project.getDeptId() == 100L || project.getDeptId() == 240L || project.getDeptId() == 253L ||
- project.getDeptId() == 254L || project.getDeptId() == 255L || project.getDeptId() == 257L ||
- project.getDeptId() == 258L || project.getDeptId() == 259L || project.getDeptId() == 269L ||
- project.getDeptId() == 270L)) {
+// if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
+// (project.getDeptId() == 100L || project.getDeptId() == 240L || project.getDeptId() == 253L ||
+// project.getDeptId() == 254L || project.getDeptId() == 255L || project.getDeptId() == 257L ||
+// project.getDeptId() == 258L || project.getDeptId() == 259L || project.getDeptId() == 269L ||
+// project.getDeptId() == 270L)) {
+ 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());
@@ -785,6 +906,31 @@
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);
+ }
}
}
}
@@ -792,9 +938,8 @@
if(null !=config && config.equals("Y")){
-
//妫�楠岀敵璇�
- if(detailsDtos.size()>0){
+ if(!detailsDtos.isEmpty()){
OutpintestapplyDto dto = new OutpintestapplyDto();
dto.setHisRegistrationId(order.getCardId());
dto.setSfzh(customer.getCusIdcard());
@@ -813,6 +958,8 @@
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());
@@ -847,6 +994,7 @@
LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
tree.setXmfl(ejjfxmzd.getYjkmdm());
}
+ tree.setCreateTime(dates);
ltkjJianchajianyanTreeService.save(tree);
}
@@ -854,7 +1002,7 @@
}
//闂ㄨ瘖妫�鏌ョ敵璇�
- if(detailsDtoss.size()>0){
+ if(!detailsDtoss.isEmpty()){
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
outpinexamapplyDto.setHisRegistrationId(order.getCardId());
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
@@ -872,6 +1020,8 @@
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());
@@ -906,14 +1056,62 @@
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.size()>0){
+ if(!detailDtos.isEmpty()){
OutpintreatapplyDto dao = new OutpintreatapplyDto();
dao.setHisRegistrationId(order.getCardId());
dao.setSfzh(customer.getCusIdcard());
@@ -932,6 +1130,8 @@
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());
@@ -966,31 +1166,31 @@
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);
- }
+// 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);
+// }
}
@Override
@@ -1529,11 +1729,13 @@
private AjaxResult getPieCharts() {
Map<String, Object> map = new HashMap<>();
+ Date date=new Date();
+
//鑾峰彇浣撴鐧昏鏁�
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
- wq0.between(TjOrder::getCreateTime, DateUtil.lastMonth(), DateUtil.now());
+ wq0.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
List<TjOrder> orderCountList = orderService.list(wq0);
- if (null != orderCountList && orderCountList.size() > 0) {
+ if (null != orderCountList && !orderCountList.isEmpty()) {
List<PieChartVo> pieChartVoList = getTjorderCountMap(orderCountList);
map.put("tjdj", pieChartVoList);
} else {
@@ -1541,11 +1743,13 @@
}
//鑾峰彇浣撴寮傚父鏁�
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.between(TjOrder::getFinishTime, DateUtil.lastMonth(), DateUtil.now());
- wq1.eq(TjOrder::getCheckStatus, 1);
- List<TjOrder> orderAbnormalCountList = orderService.list(wq1);
- if (null != orderAbnormalCountList && orderAbnormalCountList.size() > 0) {
- List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderAbnormalCountList);
+ 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()) {
+// List<TjOrder> orderList = orderAbnormalCountList.stream().distinct().collect(Collectors.toList());
+ List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderList);
map.put("tjyc", pieChartVoList);
} else {
map.put("tjyc", 0);
@@ -1612,14 +1816,14 @@
int c = 0;
int d = 0;
int e = 0;
- Map<String, Object> map = null;
+ Map<String, Object> map = new HashMap<>();
for (TjOrder tjOrder : orderList) {
- map = new HashMap<>();
LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
wq.eq(TjOrderDetail::getExceptionDesc, 1);
List<TjOrderDetail> list = tjOrderDetailService.list(wq);
- if (null != list && list.size() > 0) {
+ int count = hysqdService.getHyYcXmCount(tjOrder.getCardId());
+ if ((null != list && !list.isEmpty()) || (count>0)) {
TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
if (null != customer) {
int age = DateUtil.ageOfNow(customer.getCusBrithday());
@@ -1635,15 +1839,14 @@
e += 1;
}
}
- map.put("0-3宀�", a);
- map.put("3-16宀�", b);
- map.put("16-40宀�", c);
- map.put("40-60宀�", d);
- map.put("60宀佷互涓�", e);
}
}
+ map.put("0-3宀�", a);
+ map.put("3-16宀�", b);
+ map.put("16-40宀�", c);
+ map.put("40-60宀�", d);
+ map.put("60宀佷互涓�", e);
List<PieChartVo> pieChartVoList = new ArrayList<>();
- assert map != null;
for (Map.Entry<String, Object> entry : map.entrySet()) {
PieChartVo pieChartVo = new PieChartVo();
pieChartVo.setName(entry.getKey());
@@ -2394,11 +2597,14 @@
//涓存椂琛ㄦ坊鍔犲崟椤�
public void saveRedisTransitionByProId(String cusId,String cardId, List<Long> proIds) {
for (Long proId : proIds) {
- List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
- if (null != transitionList && transitionList.size() > 0) {
- continue;
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ 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