From e14e4217b3f53a5cad511b4331cd7c0a40a40db2 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 19 十二月 2024 13:52:03 +0800 Subject: [PATCH] zjh202412019 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 1380 +++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 911 insertions(+), 469 deletions(-) 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 a164968..268b0fc 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 @@ -12,6 +12,7 @@ import java.util.*; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Resource; @@ -20,7 +21,11 @@ import cn.hutool.core.codec.Base64; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.symmetric.DES; import cn.hutool.extra.pinyin.PinyinUtil; import cn.hutool.json.JSONArray; @@ -29,17 +34,18 @@ import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.databind.BeanProperty; import com.itextpdf.text.Document; import com.itextpdf.text.DocumentException; +import com.ltkj.common.annotation.RepeatSubmit; import com.ltkj.common.core.domain.entity.SysDept; import com.ltkj.common.core.domain.entity.SysUser; import com.ltkj.common.core.redis.RedisCache; import com.ltkj.common.enums.DataSourceType; -import com.ltkj.common.utils.PDFDocumentUtil; -import com.ltkj.common.utils.SecurityUtils; +import com.ltkj.common.utils.*; import com.ltkj.framework.config.MatchUtils; import com.ltkj.framework.config.ThreadPoolConfig; import com.ltkj.framework.config.UserHoder; @@ -50,6 +56,8 @@ import com.ltkj.hosp.hisDto.OutpinimpapplyDto; import com.ltkj.hosp.hisDto.OutpinmedicapplyDto; import com.ltkj.hosp.mapper.TestMapper; +import com.ltkj.hosp.mapper.TjSamplingMapper; +import com.ltkj.hosp.pacsDto.SavePacsApply; import com.ltkj.hosp.service.*; import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail; import com.ltkj.hosp.sqlDomain.LtkjMiddleHead; @@ -64,23 +72,26 @@ import com.ltkj.mall.mallOrderUtils.TjConstants; import com.ltkj.mall.service.IMallCheckLogService; import com.ltkj.mall.service.IMallOrderService; -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.HisApiMethod; -import com.ltkj.web.controller.his.HisApiMethodService; -import com.ltkj.web.controller.his.HisMzJysqController; +import com.ltkj.system.domain.TjDjdDyjl; +import com.ltkj.system.service.*; +import com.ltkj.web.controller.his.*; +import com.ltkj.web.controller.lis.LisApiMethod; +import com.ltkj.web.controller.pacs.PacsApiMethodService; +import com.ltkj.web.controller.service.TjSysAsyncServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.time.DateFormatUtils; import org.aspectj.weaver.ast.Var; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpRequest; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.DigestUtils; @@ -91,6 +102,8 @@ import com.ltkj.common.enums.BusinessType; import com.ltkj.common.utils.poi.ExcelUtil; import com.ltkj.common.core.page.TableDataInfo; + +import static com.ltkj.web.config.pdfutils.PDFBinaryUtil.getPDFBinary; /** * 浣撴璁板綍Controller @@ -133,61 +146,44 @@ private TjAsyncService asyncService; @Resource private ISysUserService userService; - @Resource private RedisCache redisCache; @Autowired private ITjReportPrintService tjReportPrintService; - @Resource private ITjPrintOrderService printOrderService; - @Resource private IJimuOnlineReportService reportService; - @Resource private ITjSurveyRecordService surveyRecordService; - @Autowired private IMallOrderService mallOrderService; @Autowired private IMallCheckLogService mallCheckLogService; @Resource private ITjDwDeptService dwDeptService; - @Resource private ITjDwGroupingService dwGroupingService; - @Resource private ITjOrderDetailRulesService orderDetailRulesService; - @Resource private ITjRulesService rulesService; - @Autowired private ITjAskMedicalHistoryService tjAskMedicalHistoryService; - @Autowired private ITjReportGetAddressService tjReportGetAddressService; - @Resource private TestMapper testMapper; - @Resource private LtkjMiddleDetailService middleDetailService; - @Resource private LtkjMiddleHeadService headService; @Resource private TjvLtkjvtjpatService tjvLtkjvtjpatService; @Autowired private ThreadPoolConfig threadPoolConfig; - @Autowired private HisApiMethod hisApiMethod; - - @Autowired - private HisMzJysqController hisMzJysqController; @Autowired private HisApiGetMethodService hisApiGetMethodService; @Autowired @@ -196,11 +192,42 @@ private HisApiMethodService controller; @Autowired private TjProBlService blService; + @Resource + private ITjReportTemplateService reportTemplateService; @Autowired private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService; - + @Autowired + private PacsApiMethodService pacsApiMethodService; + @Autowired + private ITbTransitionService tbTransitionService; + @Autowired + private LisApiMethod lisApiMethod; @Autowired private TjCfService cfService; + @Autowired + private TjReportController reportController; + @Resource + private ITjReportService tjReportService; + @Autowired + private HisPDFUtil hisPDFUtil; + @Value("${path.reportServer}") + private String urlValue; + @Autowired + private ITjSamplingService samplingService; + @Autowired + private TjSamplingMapper tjSamplingMapper; + @Autowired + private ITjGroupingProService groupingProService; + @Autowired + private ITjDjdDyjlService djdDyjlService; + @Autowired + private IdUtils idUtils; + @Autowired + private LtkjJybbzdService jybbzdService; + @Autowired + private LisJyflhbService lisJyflhbService; + @Autowired + private ISysDictDataService sysDictDataService; //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡 public JSONObject getJSONObject(String builder) { @@ -384,70 +411,23 @@ @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃") public AjaxResult getOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum, @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize, + @ApiParam(value = "鐘舵��") @RequestParam(required = false) Integer zt, @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum, @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name, + @ApiParam(value = "椤圭洰鍚�)") @RequestParam(required = false) String xmmc, @ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime, @ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime, @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime, - @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) { + @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime, + @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw) { Map<String, Object> map = new HashMap<>(); + List<Long> cusIds = null; if (null != name) { LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>(); wqq.like(TjCustomer::getCusName, name); - List<TjCustomer> customerList = tjCustomerService.list(wqq); - if (null != customerList && customerList.size() > 0) { - List<TjOrder> list = new ArrayList<>(); - for (TjCustomer customer : customerList) { - LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>(); - if (null != djbeginTime && null != djendTime) { - wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime)); - } - wq.eq(TjOrder::getUserId, customer.getCusId()); - list.addAll(tjOrderService.list(wq)); - } - List<TjOrder> collect = null; - if (list.size() > 0) { - for (TjOrder order : list) { - TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId()); - if (null != tjCustomer) { -// order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); - order.setTjCustomerName(tjCustomer.getCusName()); -// order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); - order.setTjCustomerPhone(tjCustomer.getCusPhone()); -// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); - order.setTjCusIdCard(tjCustomer.getCusIdcard()); - order.setTjCustomerSex(tjCustomer.getCusSex()); - order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); - order.setCareer(tjCustomer.getCareer()); - order.setIdType(tjCustomer.getIdType()); - order.setAgeUnit(tjCustomer.getAgeUnit()); - order.setTjCount(String.valueOf(tjCustomer.getCusNumber())); - } - String firmId = order.getFirmId(); - if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { - order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName()); - } - if (null != order.getPacId()) { - if (null != tjPackageService.getById(order.getPacId())) { - order.setPacName(tjPackageService.getById(order.getPacId()).getPacName()); - } - if (null != dwDeptService.getById(order.getPacId())) { - order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName()); - } - } - } - collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - } - if (null != collect) { - map.put("total", collect.size()); - } else { - map.put("total", 0); - } - map.put("list", collect); - return AjaxResult.success(map); - } - + cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList()); } + Page<TjOrder> page1 = new Page<>(pageNum, pageSize); LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>(); if (null != djbeginTime && null != djendTime) { @@ -459,6 +439,114 @@ if (null != tjNum) { wq.eq(TjOrder::getTjNumber, tjNum); } + + + if (null != xmmc) { + wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc)); + } + + if (StrUtil.isNotBlank(dw)) { + wq.like(TjOrder::getFirmName, dw); + } + + if (null != cusIds && !cusIds.isEmpty()) { + wq.in(TjOrder::getUserId, cusIds); + } + + if(null !=zt && (zt==0 || zt==1 || zt==2)){ + List<TjOrder> orders=new ArrayList<>(); + List<TjOrder> tjOrders=null; + List<TjOrder> orderList = tjOrderService.list(wq); + if(null !=orderList && !orderList.isEmpty()){ + for (TjOrder order : orderList) { + int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber()); + int sfwc = remarkService.panduaniswancheng(order.getTjNumber()); + if (zt==0 && czwj == 0) { + //鏈0 + order.setZt("鏈"); + orders.add(order); + } + if (zt==1 && czwj > 0) { + //鍦ㄦ1 + order.setZt("鍦ㄦ"); + orders.add(order); + } + if (zt==2 && sfwc == 0 && order.getCheckStatus()==0 && order.getCheckTime()==null && order.getHeshouStatus()==0 && order.getPrintLastTime()==null) { + //宸插畬鎴�2 + order.setZt("宸插畬鎴�"); + orders.add(order); + } + } + if(!orders.isEmpty()){ + tjOrders=orders.stream().sorted(Comparator.comparing(TjOrder::getCreateTime).reversed()) + .skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + for (TjOrder order : tjOrders) { + TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId()); + if (null != tjCustomer) { + order.setTjCustomerSex(tjCustomer.getCusSex()); + order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); + order.setTjCustomerName(tjCustomer.getCusName()); + order.setTjCustomerPhone(tjCustomer.getCusPhone()); + order.setTjCusIdCard(tjCustomer.getCusIdcard()); + order.setCareer(tjCustomer.getCareer()); + order.setIdType(tjCustomer.getIdType()); + order.setAgeUnit(tjCustomer.getAgeUnit()); + order.setTjCount(String.valueOf(tjCustomer.getCusNumber())); + if (null != tjCustomer.getCompName()) { + order.setDictCompName(tjCustomer.getCompName()); + } else { + String firmId = order.getFirmId(); + if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { + order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName()); + } + } + if (null != order.getPacId()) { + if (null != tjPackageService.getById(order.getPacId())) { + order.setPacName(tjPackageService.getById(order.getPacId()).getPacName()); + } else if (null != dwDeptService.getById(order.getPacId())) { + order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName()); + } + } + TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber()); + if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs())); + } + } + } + } + map.put("list", tjOrders); + map.put("total", orders.size()); + return AjaxResult.success(map); + } + + if(null !=zt){ + if(zt==3){ + //宸插鏍� + wq.isNotNull(TjOrder::getCheckTime); + wq.eq(TjOrder::getCheckStatus,1); + wq.isNull(TjOrder::getHeshouTime); + wq.isNull(TjOrder::getPrintLastTime); + wq.eq(TjOrder::getHeshouStatus,0); + } + if(zt==4){ + //鐢熸垚鎶ュ憡 + wq.isNotNull(TjOrder::getReportTime); + wq.isNull(TjOrder::getHeshouTime); + wq.isNull(TjOrder::getPrintLastTime); + wq.eq(TjOrder::getHeshouStatus,0); + } + if(zt==5){ + //鎶ュ憡鏍告敹 + wq.eq(TjOrder::getHeshouStatus,1); + wq.isNull(TjOrder::getPrintLastTime); + } + if(zt==6){ + //宸插嚭鎶ュ憡 + wq.isNotNull(TjOrder::getPrintLastTime); + wq.eq(TjOrder::getHeshouStatus,1); + wq.isNotNull(TjOrder::getPrintLastTime); + } + } + wq.orderByDesc(TjOrder::getCreateTime); Page<TjOrder> page2 = tjOrderService.page(page1, wq); List<TjOrder> list = page2.getRecords(); @@ -470,23 +558,77 @@ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); order.setTjCustomerName(tjCustomer.getCusName()); order.setTjCustomerPhone(tjCustomer.getCusPhone()); -// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); order.setTjCusIdCard(tjCustomer.getCusIdcard()); order.setCareer(tjCustomer.getCareer()); order.setIdType(tjCustomer.getIdType()); order.setAgeUnit(tjCustomer.getAgeUnit()); order.setTjCount(String.valueOf(tjCustomer.getCusNumber())); - } - String firmId = order.getFirmId(); - if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { - order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName()); - } - if (null != order.getPacId()) { - if (null != tjPackageService.getById(order.getPacId())) { - order.setPacName(tjPackageService.getById(order.getPacId()).getPacName()); + if (null != tjCustomer.getCompName()) { + order.setDictCompName(tjCustomer.getCompName()); + } else { + String firmId = order.getFirmId(); + if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { + order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName()); + } } - if (null != dwDeptService.getById(order.getPacId())) { - order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName()); + if (null != order.getPacId()) { + if (null != tjPackageService.getById(order.getPacId())) { + order.setPacName(tjPackageService.getById(order.getPacId()).getPacName()); + } else if (null != dwDeptService.getById(order.getPacId())) { + order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName()); + } + } + TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber()); + if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs())); + } + int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber()); + int sfwc = remarkService.panduaniswancheng(order.getTjNumber()); + Date checkTime = order.getCheckTime(); + Date reportTime = order.getReportTime(); + Integer heshouStatus = order.getHeshouStatus(); + Date lastTime = order.getPrintLastTime(); + + if(null !=zt){ + if(zt==3){ + order.setZt("宸插鏍�"); + } + if(zt==4){ + order.setZt("鐢熸垚鎶ュ憡"); + } + if(zt==5){ + order.setZt("鎶ュ憡鏍告敹"); + } + if(zt==6){ + order.setZt("宸插嚭鎶ュ憡"); + } + }else { + if (czwj == 0) { + //鏈0 + order.setZt("鏈"); + } + if (czwj > 0) { + //鍦ㄦ1 + order.setZt("鍦ㄦ"); + } + if (sfwc == 0) { + //宸插畬鎴�2 + order.setZt("宸插畬鎴�"); + } + if (null != checkTime) { + //宸插鏍�3 + order.setZt("宸插鏍�"); + } + if (null != reportTime) { + //鐢熸垚鎶ュ憡4 + order.setZt("鐢熸垚鎶ュ憡"); + } + if (1== heshouStatus) { + //鎶ュ憡鏍告敹5 + order.setZt("鎶ュ憡鏍告敹"); + } + if (null != lastTime) { + //宸插嚭鎶ュ憡6 + order.setZt("宸插嚭鎶ュ憡"); } } } @@ -501,85 +643,41 @@ @ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃") public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum, @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize, + @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(required = false) Integer dyzt, @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum, @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name, - @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime, - @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) { - Map<String, Object> map = new HashMap<>(); - if (null != name) { + @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw, + @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime, + @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) { + /* Map<String, Object> map = new HashMap<>(); + List<Long> cusIds = null; + if (StringUtil.isNotBlank(name)) { LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>(); wqq.like(TjCustomer::getCusName, name); - List<TjCustomer> customerList = tjCustomerService.list(wqq); - if (null != customerList && customerList.size() > 0) { - List<TjOrder> list = new ArrayList<>(); - for (TjCustomer customer : customerList) { - LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>(); - wq.isNotNull(TjOrder::getReportTime); - wq.eq(TjOrder::getUserId, customer.getCusId()); - wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃 - list.addAll(tjOrderService.list(wq)); - } - List<TjOrder> collect = null; - if (list.size() > 0) { - - for (int i = 0; i < list.size(); i++) { - TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId()); - if (null == tjCustomer) { - list.remove(list.get(i)); - continue; - } - list.get(i).setTjCustomerSex(tjCustomer.getCusSex()); - list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); - list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); - list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); - list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); - - String firmId = list.get(i).getFirmId(); - if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) { - list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName()); - } - if (null != list.get(i).getPacId()) { - if (null != tjPackageService.getById(list.get(i).getPacId())) { - list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName()); - } - if (null != dwDeptService.getById(list.get(i).getPacId())) { - list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName()); - } - } - //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂� - LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>(); - wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber()); - wqqq.orderByDesc(TjReportPrint::getPrintTime); - wqqq.last("limit 1"); - TjReportPrint one = tjReportPrintService.getOne(wqqq); - if (one != null) { - list.get(i).setPrintLastTime(one.getPrintTime()); - } - - } - collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - } - if (null != collect) { - map.put("total", collect.size()); - } else { - map.put("total", 0); - } - map.put("list", collect); - return AjaxResult.success(map); - } - + cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList()); } Page<TjOrder> page1 = new Page<>(pageNum, pageSize); LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>(); - wq.isNotNull(TjOrder::getReportTime); - wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃 - if (null != bgbeginTime && null != bgendTime) { - wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(bgbeginTime), DateUtil.endOfDay(bgendTime)); + if (dyzt == 0) { + wq.isNull(TjOrder::getPrintLastTime); + wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃 + } else { + wq.isNotNull(TjOrder::getPrintLastTime); + } + + if (null != djbeginTime && null != djendTime) { + wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(DateUtil.parseDate(djbeginTime)), DateUtil.endOfDay(DateUtil.parseDate(djendTime))); } if (null != tjNum) { - wq.eq(TjOrder::getTjNumber, tjNum); + wq.like(TjOrder::getTjNumber, tjNum); } - wq.orderByDesc(TjOrder::getReportTime); + if (StringUtil.isNotBlank(dw)) { + wq.like(TjOrder::getFirmName, dw); + } + if (null != cusIds && !cusIds.isEmpty()) { + wq.in(TjOrder::getUserId, cusIds); + } + wq.orderByDesc(TjOrder::getCreateTime); Page<TjOrder> page2 = tjOrderService.page(page1, wq); List<TjOrder> list = page2.getRecords(); if (list != null) { @@ -591,15 +689,19 @@ } list.get(i).setTjCustomerSex(tjCustomer.getCusSex()); list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday())); - list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName())); - list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone())); + list.get(i).setTjCustomerName(tjCustomer.getCusName()); + list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone()); if (tjCustomer.getCusIdcard() != null) { - list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard())); + list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard()); } - String firmId = list.get(i).getFirmId(); - if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) { - list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName()); + if (null != tjCustomer.getCompName()) { + list.get(i).setDictCompName(tjCustomer.getCompName()); + } else { + String firmId = list.get(i).getFirmId(); + if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) { + list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName()); + } } if (null != list.get(i).getPacId()) { if (null != tjPackageService.getById(list.get(i).getPacId())) { @@ -610,18 +712,22 @@ } } //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂� - LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>(); - wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber()); - wqqq.orderByDesc(TjReportPrint::getPrintTime); - wqqq.last("limit 1"); - TjReportPrint one = tjReportPrintService.getOne(wqqq); - if (one != null) { - list.get(i).setPrintLastTime(one.getPrintTime()); - } +// LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>(); +// wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber()); +// wqqq.orderByDesc(TjReportPrint::getPrintTime); +// wqqq.last("limit 1"); +// TjReportPrint one = tjReportPrintService.getOne(wqqq); +// if (one != null) { +// list.get(i).setPrintLastTime(one.getPrintTime()); +// } } } map.put("list", list); - map.put("total", page2.getTotal()); + map.put("total", page2.getTotal());*/ + + if (djbeginTime == null) djbeginTime = ""; + if (djendTime == null) djendTime = ""; + Map<String, Object> map= tjOrderService.getTjBgdyList(pageNum,pageSize,dyzt,tjNum,name,dw,djbeginTime,djendTime); return AjaxResult.success(map); } @@ -862,9 +968,14 @@ /** * 浣撴绛惧埌鐧昏鎺ュ彛 */ + + + ReentrantLock lock = new ReentrantLock(); + @PostMapping @ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛") - @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�) +// @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�) + @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED) public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception { Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId()); SysUser sysUser = userService.getById(userId); @@ -886,8 +997,7 @@ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId()); return AjaxResult.error("涓嶅彲閲嶅鐧昏"); } - - + TjFlowingWater tjFlowingWater = new TjFlowingWater(); LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard()); wq1.eq(TjReservation::getIsExpire, 2); @@ -896,16 +1006,17 @@ if (null != tjReservation) { tjOrder.setReservationId(tjReservation.getId()); mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId())); -// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) { -// return AjaxResult.error("鏈埌棰勭害鏃堕棿"); -// } - if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) { + // if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) { + // return AjaxResult.error("鏈埌棰勭害鏃堕棿"); + // } + if (DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(), tjReservation.getYxts())).before(new Date())) { tjReservation.setIsExpire(1); tjReservationService.updateById(tjReservation); return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�"); } if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo()); - if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId()); +// if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId()); +// if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany()); if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment()); if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo()); if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId()); @@ -914,18 +1025,25 @@ tjOrder.setGroupId(tjReservation.getGroupingId()); tjOrder.setFirmDeptId(tjReservation.getPacId()); } -// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId()); tjReservation.setIsExpire(1); tjReservationService.updateById(tjReservation); - if (null != tjReservation.getTeamNo()) { + if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) { tjOrder.setTjType("1"); - } else { + } else if (tjOrder.getTjType().equals("2")) { tjOrder.setTjType("2"); } } - //鐢熸垚浣撴鍙� - String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date())); - tjOrder.setTjNumber(tjNumber); + + if (null != tjCustomer.getCompName()) { + tjOrder.setFirmName(tjCustomer.getCompName()); + } + if (null != tjCustomer.getDictCompId()) { + tjOrder.setFirmId(String.valueOf(tjCustomer.getDictCompId())); + } else { + tjOrder.setFirmId("0"); + } + + if (null != tjOrder.getPhoto()) { File file = new File(tjOrder.getPhoto()); if (file.isFile()) { @@ -938,9 +1056,8 @@ tjOrder.setPhoto(encode); } } - if (tjOrder.getFirmId() == null) { - tjOrder.setFirmId("0"); - } + + if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) { tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))); } @@ -948,13 +1065,38 @@ if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId())); tjOrder.setStatus(TjConstants.TJ_BEGIN); tjOrder.setCardId(tjCustomer.getCardId()); - if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){ + if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) { tjOrder.setFinishTime(new Date()); tjOrder.setCheckStatus(1); tjOrder.setStatus(TjConstants.TJ_WAIT); + // tjFlowingWater.setPayStasus(1L); } - if (tjOrderService.save(tjOrder)) { + tjFlowingWater.setPayStasus(0L); + try { + boolean b = lock.tryLock(3, TimeUnit.MINUTES); + if (b) { + AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser); + if (!result.get("code").toString().equals("200")) + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + tjOrderService.tjQiandaodengji(tjOrder.getTjNumber()); + return result; + } + } finally { + lock.unlock(); + } + return AjaxResult.error(); + } + + @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED) + public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) { + //鐢熸垚浣撴鍙� + String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date())); + tjOrder.setTjNumber(tjNumber); + BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())); + + tjOrder.setDiscount(discount.toString()); + if (tjOrderService.save(tjOrder)) { //淇濆瓨鏀惰揣鍦板潃 if ("2".equals(tjOrder.getGetType())) { final TjReportGetAddress address = tjOrder.getAddAddress(); @@ -966,9 +1108,7 @@ Long cusNumber = tjCustomer.getCusNumber(); cusNumber += 1; tjCustomer.setCusNumber(cusNumber); - BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10)); - TjFlowingWater tjFlowingWater = new TjFlowingWater(); - tjFlowingWater.setPayStasus(0L); + if ("1".equals(tjOrder.getTjType())) { if (null != tjReservation && tjReservation.getPayType() == 1) { tjFlowingWater.setPayStasus(3L); @@ -1020,58 +1160,56 @@ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith()); tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn()); tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount()); -// tjFlowingWater.setPayStasus(0L); + // tjFlowingWater.setPayStasus(0L); } } if (tjFlowingWaterService.save(tjFlowingWater)) { tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber())); tjOrderService.updateById(tjOrder); - - } - //鍥綋 - if ("1".equals(tjOrder.getTjType())) { - asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater); - } - //涓汉 - if ("2".equals(tjOrder.getTjType())) { - //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); - newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); - } - - //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌 - //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12 -// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); -// if ("Y".equals(getInfoFromSqlData)){ -// List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard()); -// if (one!=null){ -// for (LtkjMiddleHead ltkjMiddleHead : one) { -// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); -// headService.save(ltkjMiddleHead); -// DynamicDataSourceContextHolder.clearDataSourceType(); -// List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId()); -// if (detailList!=null){ -// for (LtkjMiddleDetail ltkjMiddleDetail : detailList) { -// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); -// middleDetailService.save(ltkjMiddleDetail); -// DynamicDataSourceContextHolder.clearDataSourceType(); -// } -// } -// } -// -// } -// } - + //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙� + transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber()); /*璋冪敤his鎺ュ彛*/ String config = configService.selectConfigByKey("sfkqdyhis"); if (null != config && config.equals("Y")) { - AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId()); + AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder); if (!result.get("code").toString().equals("200")) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + Object jzh = result.get("jzh"); + if (null != jzh && null != jzh.toString()) { + hisApiMethod.ZfHisApiMethod(jzh.toString()); + } + log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId()); return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString()); } + + log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId()); + //鍥綋 + if ("1".equals(tjOrder.getTjType())) { +// asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater); + ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater); + } + //涓汉 + if ("2".equals(tjOrder.getTjType())) { + //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); + newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); + } + // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs + if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) { + // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁 + tjFlowingWater.setPayStasus(1L); + newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); + AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result); + 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())); + } else { + hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId()); + } +// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId()); + return AjaxResult.success(tjNumber); } else { tjCustomer.setCardId(tjOrder.getTjNumber()); tjCustomerService.updateById(tjCustomer); @@ -1079,9 +1217,112 @@ tjOrder.setCardId(tjOrder.getTjNumber()); tjOrderService.updateById(tjOrder); } + + //鍥綋 + if ("1".equals(tjOrder.getTjType())) { +// asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater); + asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater); + } + //涓汉 + if ("2".equals(tjOrder.getTjType())) { + //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); + newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); + List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); + addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); + } + // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs + if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) { + // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁 + tjFlowingWater.setPayStasus(1L); + newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); +// AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result); +// 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())); + + List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); + addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); + + } +// pacsApiMethodService.OrderAdd(tjCustomer,tjOrder); return AjaxResult.success(tjNumber); } + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(); + } + + public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) { + if (null != detailList && detailList1) { + Date date = new Date(); + String format = DateUtil.format(date, "yyMMddHHmmssSSS"); + for (TjOrderDetail detail : detailList) { + TjSampling sampling = new TjSampling(); + if (null == projectService.getById(detail.getProId())) continue; + TjProject project = projectService.getById(detail.getProId()); + Long proParentId = project.getProParentId(); + String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType()); + if (null != proParentId && proParentId == 0) { + sampling.setJyxh(idUtils.generateLisID()); + sampling.setSpecimenTypeCode(project.getSpecimenType()); + sampling.setSpecimenType(dictLabel); + sampling.setJyxmdm(project.getProId().toString()); + } else { + TjProject project1 = projectService.getById(proParentId); + sampling.setJyxh(idUtils.generateLisID()); + + sampling.setSpecimenTypeCode(project1.getSpecimenType()); + sampling.setSpecimenType(dictLabel); + sampling.setJyxmdm(project.getProId().toString()); + + } + sampling.setSamplingNumber(format); + sampling.setTjNum(order.getTjNumber()); + sampling.setCusId(String.valueOf(order.getUserId())); + if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) { + sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName()); + } + sampling.setApplicationTime(date); + sampling.setTjTime(order.getCreateTime()); + sampling.setProId(String.valueOf(detail.getProId())); + sampling.setProName(projectService.getById(detail.getProId()).getProName()); + sampling.setCreateBy(sysUser.getNickName()); + sampling.setCreateTime(date); + sampling.setUpdateBy(sysUser.getNickName()); + sampling.setUpdateTime(date); + sampling.setCreateId(String.valueOf(sysUser.getUserId())); + sampling.setUpdateId(String.valueOf(sysUser.getUserId())); + sampling.setJxbz(jxbz); + samplingService.save(sampling); + } + } + String config = configService.selectConfigByKey("sfkqdyhis"); + if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) { + AjaxResult ajaxResult = lisApiMethod.getJyFlHb(); + if (ajaxResult.get("code").toString().equals("200")) { + String str = ajaxResult.get("data").toString(); + str = str.replace("=", ":"); + JSONArray array = JSONUtil.parseArray(str); + for (Object o : array) { + JSONObject object = (JSONObject) o; + LisJyflhb lisJyflhb = new LisJyflhb(); + lisJyflhb.setHbhxm(object.getStr("hbhxm")); + lisJyflhb.setFlmc(object.getStr("flmc")); + lisJyflhb.setMc(object.getStr("mc")); + lisJyflhb.setFlbm(object.getStr("flbm")); + LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm()); + LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper); + if (jyflhb == null) { + lisJyflhb.setId(IdUtil.getSnowflake().nextId()); + lisJyflhbService.save(lisJyflhb); + } else { + lisJyflhb.setId(jyflhb.getId()); + lisJyflhbService.updateById(lisJyflhb); + } + } + } + + } } @@ -1092,7 +1333,7 @@ SysUser sysUser = UserHoder.getLoginUser().getUser(); List<String> cusIds = daoDto.getCusIds(); ArrayList<String> tjNumbers = new ArrayList<>(); - if (null != cusIds && cusIds.size() > 0) { + if (null != cusIds && !cusIds.isEmpty()) { ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size()); for (String cusId : cusIds) { threadPools.execute(new Runnable() { @@ -1105,7 +1346,7 @@ LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>(); wq.in(TjCustomer::getCusIdcard, cusIds); List<Long> list = tjCustomerService.list(wq).stream().map(TjCustomer::getCusId).collect(Collectors.toList()); - if (list.size() > 0) { + if (!list.isEmpty()) { // ExecutorService threadPool = Executors.newFixedThreadPool(list.size()); ThreadPoolTaskExecutor executor = threadPoolConfig.threadPoolTaskExecutor(); for (Long aLong : list) { @@ -1541,7 +1782,7 @@ if (null != tjCustomer) { cardId = tjCustomer.getCardId(); } - if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) { + if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) { transitionService.deletedTbTransitionByCusId(cusId); if (redisCache.hasKey(cardId + cusId)) { redisCache.deleteObject(cardId + cusId); @@ -1550,143 +1791,37 @@ redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId); } } -// List<TbTransition> tbTransitionList = null; -// if (!redisCache.hasKey(cardId + cusId)) { -// tbTransitionList = new ArrayList<>(); -// } else { -// tbTransitionList = redisCache.getCacheList(cardId + cusId); -// } - //濂楅 /*濂楅*/ if (null != packId && !packId.equals("")) { Long pacId = Long.valueOf(packId.toString()); List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId)); - if (null == list || list.size() == 0) { + if (null == list || list.isEmpty()) { transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId); -// if (redisCache.hasKey(cardId + cusId + "cusId")) -// redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId); -// if (redisCache.hasKey(cardId + cusId)) { -// tbTransitionList = new ArrayList<>(); -// redisCache.deleteObject(cardId + cusId); -// } List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId)); - if (null != ppList && ppList.size() > 0) { - transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId); - //寮傛淇濆瓨鏁版嵁搴� -// asyncService.addRedisTransitionPac(cusId, pacId, ppList); -// asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null); -// for (TjPackageProject tjPackageProject : ppList) { -// TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId())); -// if (null != project) { -// -// BigDecimal divide = BigDecimal.valueOf(0); -// if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) { -// divide = BigDecimal.valueOf(0); -// } else { -// divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN); -// } -// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); -// if (null != tjProSonList && tjProSonList.size() > 0) { -// //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList); -// for (TjProject tjProject : tjProSonList) { -// TbTransition tbTransition = new TbTransition(); -// tbTransition.setCusId(cusId); -// tbTransition.setPacId(pacId); -// if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) { -// tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN)); -// tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN)); -// } else { -// tbTransition.setNowPrice(BigDecimal.valueOf(0.00)); -// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00)); -// } -// tbTransition.setParentProId(project.getProId()); -// tbTransition.setParentProName(project.getProName()); -// tbTransition.setProId(tjProject.getProId()); -// tbTransition.setProName(tjProject.getProName()); -// tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName()); -// tbTransition.setProType(tjProject.getProType()); -// tbTransition.setProCheckMethod(tjProject.getProCheckMethod()); -// tbTransitionList.add(tbTransition); -// } -// -// } -// } -// } + if (null != ppList && !ppList.isEmpty()) { + String string = transitionService.panduantaocanshifouchongfu(cusId, pacId); + if (!StringUtils.isBlank(string)) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string); + } + transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId); } } } //鍗曢」 - if (null != proIds && proIds.size() > 0) { + if (null != proIds && !proIds.isEmpty()) { //寮傛淇濆瓨鏁版嵁搴撹〃 -// asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds); for (Long proId : proIds) { TjProject project = projectService.selectTjProjectByProId(proId); - if(null !=project){ //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�")) + if (null != project) { List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); - if (null == transitionList || transitionList.size() == 0) { - transitionService.saveRedisTransitionByProId(cusId,cardId, proId); + if (null == transitionList || transitionList.isEmpty()) { + transitionService.saveRedisTransitionByProId(cusId, cardId, proId); } } -// if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId); } -// for (Long proId : proIds) { -// List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId)); -// if (null != transitions && transitions.size() > 0) { -// continue; -// } -// TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId)); -// if (null != tjProject) { -//// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); -//// if (null != tjProSonList && tjProSonList.size() > 0) { -//// for (TjProject tjProject : tjProSonList) { -//// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId())); -//// if (null != transitionss && transitionss.size() > 0) { -//// continue; -//// } -// TbTransition tbTransition = new TbTransition(); -// tbTransition.setCusId(cusId); -// tbTransition.setPacId(null); -// if (null != tjProject.getProPrice()) { -// tbTransition.setOrdPrice(tjProject.getProPrice()); -// tbTransition.setNowPrice(tjProject.getProPrice()); -// } else { -// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00)); -// tbTransition.setNowPrice(BigDecimal.valueOf(0.00)); -// } -// tbTransition.setParentProId(tjProject.getProParentId()); -// if (tjProject.getProParentId() != null) { -// TjProject byId = projectService.getById(tjProject.getProParentId()); -// if (null != byId) { -// tbTransition.setParentProName(byId.getProName()); -// } -// } -// tbTransition.setParentProName(""); -// -// tbTransition.setProId(tjProject.getProId()); -// tbTransition.setProName(tjProject.getProName()); -// tbTransition.setProType(tjProject.getProType()); -// tbTransition.setProCheckMethod(tjProject.getProCheckMethod()); -// tbTransitionList.add(tbTransition); -//// } -//// } -// } -// } } - - -// if (null != tbTransitionList && tbTransitionList.size() > 0) { -// if (redisCache.hasKey(cardId + cusId)) { -// redisCache.deleteObject(cardId + cusId); -// redisCache.setCacheList(cardId + cusId, tbTransitionList); -// redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId)); -// } else { -// redisCache.setCacheList(cardId + cusId, tbTransitionList); -// redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId)); -// } -// List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList); -// return AjaxResult.success(); -// } return AjaxResult.success(); } @@ -1885,6 +2020,7 @@ } } } + remarkService.updateRemark(tjNumber); asyncService.tjGoutAsync(domainVos, sysUser, list); TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId()); @@ -1919,9 +2055,9 @@ dto.setJzqk(9); controller.Outpinimpapply(dto); }*/ - return AjaxResult.success("绛剧鎴愬姛锛�"); } else { + remarkService.updateRemark(tjNumber); return getAjaxResult(tjNumber); } } @@ -1994,7 +2130,7 @@ map.put("proPrantId", entry.getKey().toString()); if (null != pacId) { TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId()); - map.put("tjCategory",aPackage.getTjCategory()); + map.put("tjCategory", aPackage.getTjCategory()); map.put("pacName", aPackage.getPacName()); TjProject tjProject = projectService.getById(entry.getKey()); // TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId) @@ -2007,7 +2143,7 @@ // } map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId)); } else { - map.put("tjCategory",null); + map.put("tjCategory", null); map.put("pacName", "鍗曢」"); List<TbTransition> tbTransitionList = entry.getValue(); if (null != tbTransitionList && tbTransitionList.size() > 0) { @@ -2046,7 +2182,7 @@ map.put("proPrantId", entry.getKey().toString()); if (null != pacId) { TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId()); - map.put("tjCategory",aPackage.getTjCategory()); + map.put("tjCategory", aPackage.getTjCategory()); map.put("pacName", aPackage.getPacName()); TjProject tjProject = projectService.getById(entry.getKey()); // TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId) @@ -2057,9 +2193,9 @@ // } else { // map.put("nowPrice", tjProject.getProPrice()); // } - map.put("nowPrice",tjProject.getProPrice()); + map.put("nowPrice", tjProject.getProPrice()); } else { - map.put("tjCategory",null); + map.put("tjCategory", null); map.put("pacName", "鍗曢」"); List<TbTransition> tbTransitionList = entry.getValue(); if (null != tbTransitionList && tbTransitionList.size() > 0) { @@ -2297,79 +2433,80 @@ @GetMapping("/getTransitionInfo") @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�") - public AjaxResult getTransitionInfo(@RequestParam("tjNumber")String tjNumber){ + public AjaxResult getTransitionInfo(@RequestParam("tjNumber") String tjNumber) { QueryWrapper<TbTransition> wrapper = new QueryWrapper<>(); - wrapper.select("parent_pro_id","parent_pro_name","sum(ord_price) as ord_price") - .eq("tj_num",tjNumber) + wrapper.select("parent_pro_id", "parent_pro_name", "sum(ord_price) as ord_price") + .eq("tj_num", tjNumber) .groupBy("parent_pro_name"); List<TbTransition> list = transitionService.list(wrapper); List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList()); LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>(); - projectQueryWrapper.in(TjProject::getProId,parentProIds); + projectQueryWrapper.in(TjProject::getProId, parentProIds); List<TjProject> projects = projectService.list(projectQueryWrapper); JSONArray huiZong = JSONUtil.createArray(); int index = 1; for (TjProject project : projects) { LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysDept::getDeptId,project.getDeptId()); + queryWrapper.eq(SysDept::getDeptId, project.getDeptId()); SysDept dept = sysDeptService.getOne(queryWrapper); for (TbTransition tbTransition : list) { - if (tbTransition.getParentProId().toString().equals(project.getProId().toString())){ + if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) { JSONObject obj = JSONUtil.createObj(); - obj.putOpt("index",index++); - obj.putOpt("parent_pro_name",tbTransition.getParentProName()); - obj.putOpt("price",tbTransition.getOrdPrice()); - obj.putOpt("ks",dept.getDeptName()); + obj.putOpt("index", index++); + obj.putOpt("parent_pro_name", tbTransition.getParentProName()); + obj.putOpt("price", tbTransition.getOrdPrice()); + obj.putOpt("ks", dept.getDeptName()); huiZong.add(obj); } } } wrapper = new QueryWrapper<>(); - wrapper.eq("tj_num",tjNumber); + wrapper.eq("tj_num", tjNumber); list = transitionService.list(wrapper); JSONArray info = JSONUtil.createArray(); index = 1; for (TbTransition tbTransition : list) { JSONObject obj = JSONUtil.createObj(); - obj.putOpt("index",index++); - obj.putOpt("parent_pro_name",tbTransition.getParentProName()); - obj.putOpt("pro_name",tbTransition.getProName()); + obj.putOpt("index", index++); + obj.putOpt("parent_pro_name", tbTransition.getParentProName()); + obj.putOpt("pro_name", tbTransition.getProName()); BigDecimal ordPrice = tbTransition.getOrdPrice(); - obj.putOpt("zongjia",ordPrice); + obj.putOpt("zongjia", ordPrice); QueryWrapper<TjProject> queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("pro_id",tbTransition.getProId()); + queryWrapper.eq("pro_id", tbTransition.getProId()); TjProject tjProject = projectService.getOne(queryWrapper); Integer num = tjProject.getSl(); - obj.putOpt("num",num); + obj.putOpt("num", num); BigDecimal price = ordPrice.divide(new BigDecimal(num)); - obj.putOpt("danjia",price); + obj.putOpt("danjia", price); Date createTime = tbTransition.getCreateTime(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - obj.putOpt("time",dateFormat.format(createTime)); + obj.putOpt("time", dateFormat.format(createTime)); info.put(obj); } HashMap<String, Object> map = new HashMap<>(); - map.put("huizong",huiZong); - map.put("info",info); - return AjaxResult.success().put("data",map); + map.put("huizong", huiZong); + map.put("info", info); + return AjaxResult.success().put("data", map); } + public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) { tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId())); - if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){ - tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); - }else { - tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); - } + if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) { + tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), + String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber())); + } else { + tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId()); + } - tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); - //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙� - transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber()); + tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId()); + //娣诲姞remark琛ㄦ暟鎹� - if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){ + if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) { remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId())); - }else { + } else { remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId())); } @@ -2387,27 +2524,197 @@ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith()); tjFlowingWater.setPayType(4L); tjFlowingWaterService.updateById(tjFlowingWater); - asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser); +// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser); } -// System.out.println("杩欐浠g爜鏃堕棿" + (System.currentTimeMillis() - l)); } - @PostMapping("/heXiaoByIds/{orderIds}") - @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃") - @Transactional - public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) { - for (String orderId : orderIds) { - final TjOrder byId = tjOrderService.getById(orderId); - byId.setHeshouStatus(1); - byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId()); - byId.setHeshouTime(new DateTime()); - final boolean b = tjOrderService.updateById(byId); - if (!b) { - return AjaxResult.error("鏍告敹澶辫触"); + 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()), tjOrder.getCardId()); + if (!b) { + List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId())); + if (null != proList && !proList.isEmpty()) { + for (TjGroupingPro groupingPro : proList) { + TjOrderDetail detail = new TjOrderDetail(); + TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId())); + detail.setIsSampling(String.valueOf(tjProject.getIsSampling())); + detail.setOrderId(tjOrder.getOrderId()); + detail.setProId(Long.valueOf(groupingPro.getProId())); + detail.setTjStatus(0L); + detail.setCreateBy(sysUser.getNickName()); + detail.setCreateTime(new Date()); + detail.setUpdateBy(sysUser.getNickName()); + detail.setUpdateTime(new Date()); + detail.setCreateId(String.valueOf(sysUser.getUserId())); + detail.setUpdateId(String.valueOf(sysUser.getUserId())); + tjOrderDetailService.save(detail); + } + List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList()); + List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list)); + for (TjProject project : projectList) { + TjOrderDetail detail = new TjOrderDetail(); + detail.setOrderId(tjOrder.getOrderId()); + detail.setProId(project.getProId()); + detail.setTjStatus(0L); + detail.setCreateBy(sysUser.getNickName()); + detail.setCreateTime(new Date()); + detail.setUpdateBy(sysUser.getNickName()); + detail.setUpdateTime(new Date()); + detail.setCreateId(String.valueOf(sysUser.getUserId())); + detail.setUpdateId(String.valueOf(sysUser.getUserId())); + //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉 + if (null != project.getProDefault()) { + detail.setProResult(project.getProDefault()); + } else { + detail.setProResult(null); + } + detail.setIsSampling(String.valueOf(project.getIsSampling())); + + tjOrderDetailService.save(detail); + } } } + + //娣诲姞remark琛ㄦ暟鎹� + remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId())); + + //鍒ゆ柇鏄惁浜ら挶 + if ("1".equals(tjOrder.getTjType())) { + if (null != tjReservation && tjReservation.getPayType() == 1) { + tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), + sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); + } + } + if (tjFlowingWater.getPayStasus() == 1) { + tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), + sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); + } + if (tjFlowingWater.getDiscount() == null) { + transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber()); + } else { + transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber()); + } + + tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId()); +// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId())); +// if (list != null) { +// for (TjOrderDetail tjOrderDetail : list) { +// TjProject tjProject = projectService.getById(tjOrderDetail.getProId()); +// if(tjProject==null){ +// continue; +// } +// tjOrderDetail.setProject(tjProject); +// if (tjProject.getProParentId() == 0) { +// TjOrderRemark tjOrderRemark = new TjOrderRemark(); +// tjOrderRemark.setProId(tjProject.getProId()); +// tjOrderRemark.setProName(tjProject.getProName()); +// tjOrderRemark.setDeptId(tjProject.getDeptId()); +// tjOrderRemark.setTjNumber(tjOrder.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); +// } +// if ("1".equals(tjOrder.getTjType())) { +// if (null != tjReservation && tjReservation.getPayType() == 1) { +// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); +// } +// } +// if(tjFlowingWater.getPayStasus()==1){ +// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber())); +// } +// tjOrderDetailService.updateById(tjOrderDetail); +// } +// } + } + + @PostMapping("/heXiaoByIds") + @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃") + @Transactional + @RepeatSubmit + public AjaxResult heXiaoByIds(@RequestBody List<String> orderIds) { + Date date = new Date(); + if(null !=orderIds && !orderIds.isEmpty()){ + for (String orderId : orderIds) { + TjOrder byId = tjOrderService.getById(orderId); + if (null != byId) { + + /*if (byId.getReportTime() == null) { + LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>(); + tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1); + tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0); + TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper); + if ("鎶ヨ〃".equals(reportTemplate.getPrint())) { + TjReport tjReport = new TjReport(); + tjReport.setTjNumber(String.valueOf(byId.getTjNumber())); + tjReport.setPath(reportTemplate.getUrl() + "?tjNum=" + byId.getTjNumber()); + tjReport.setType("浣撴鎶ュ憡"); + tjReport.setPrint("鎶ヨ〃"); + tjReportService.save(tjReport); + //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿 + LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(TjOrder::getTjNumber, byId.getTjNumber()); + updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END); + tjOrderService.update(updateWrapper); + } + + LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>(); + wq1.eq(TjCustomer::getCusId, byId.getUserId()); + TjCustomer tjCustomer = tjCustomerService.getOne(wq1); + LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TjReportTemplate::getFlag, "4"); + wrapper.eq(TjReportTemplate::getOpen, "1"); + TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper); + try { + shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing); + byId.setStatus(TjConstants.TJ_END); + } catch (Exception e) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + e.printStackTrace(); + // 璋冪敤鎾ら攢 + logger.error("鐢熸垚鎶ュ憡寮傚父"); + return AjaxResult.error("鐢熸垚鎶ュ憡寮傚父,鏍告敹澶辫触"); + } + }*/ + byId.setHeshouStatus(1); + byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId()); + byId.setHeshouTime(date); + final boolean b = tjOrderService.updateById(byId); + if (!b) { + return AjaxResult.error("鏍告敹澶辫触"); + } + } + } + } return AjaxResult.success("鏍告敹鎴愬姛"); + } + + + public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception { + + AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate, zongJianYiShiQianMing); + if (!ajaxResult.get("code").toString().equals("200")) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + } else { + Long userId = tjCustomer.getCusId(); + String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf"; + TjReport tjReport = new TjReport(); + tjReport.setTjNumber(String.valueOf(tjNumber)); + tjReport.setPath(urlValue + outputFileName1); + String outputPath1 = value + File.separator; + String pdfBinary = getPDFBinary(outputPath1 + outputFileName1); + tjReport.setReport(pdfBinary); + tjReport.setType("浣撴鎶ュ憡"); + tjReport.setPrint("pdf"); + tjReportService.save(tjReport); + } + return ajaxResult; } @GetMapping("/getHistryTjOrderByCusIdCard") @@ -2537,6 +2844,7 @@ // if (null != payByTjNum) { // return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!"); // } + if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!"); tjOrderService.deleteTjOrderByOrderId(order.getOrderId()); tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId())); remarkService.deletedOrderRemarkByTjNum(tjNum); @@ -2544,40 +2852,37 @@ transitionService.deletedTbTransitionByTjNum(tjNum); TjCustomer customer = tjCustomerService.getById(order.getUserId()); - if (null != customer) { - customer.setCardId("0"); - tjCustomerService.updateById(customer); - } + customer.setCardId("0"); + tjCustomerService.updateById(customer); String configByKey = configService.selectConfigByKey("sfkqdyhis"); + tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId()); if (configByKey.equals("Y")) { - HashMap<String, Object> map = new HashMap<>(); - map.put("cardtype", "4"); - map.put("input", order.getCardId()); - LocalDate currentDate = LocalDate.now(); - LocalDateTime startOfDay = currentDate.atStartOfDay(); - LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0)); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - String ksrq = startOfDay.format(formatter); - String jsrq = nineteenOClock.format(formatter); - map.put("ksrq", ksrq); - map.put("jsrq", jsrq); - AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map); - if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) { - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮h�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖"); - } else { - boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order); - if (zfHisApiMethods) { - return AjaxResult.success("鎾ら攢鎴愬姛", map); - } else { + + HashMap<String, Object> hisRequestParams = new HashMap<>(); + hisRequestParams.put("patientId", order.getCardId()); + AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams); + if (Integer.parseInt(queryPay.get("code").toString()) == 200) { + List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data"); + + BigDecimal cateFeeAll = BigDecimal.ZERO; + for (Map<String, String> datum : data) { + BigDecimal cateFee = new BigDecimal(datum.get("CateFee")); + cateFeeAll = cateFeeAll.add(cateFee); + } + if (cateFeeAll.compareTo(BigDecimal.ZERO) != 0) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触"); + return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!"); } } - } + boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order)); + if (zfHisApiMethods) { + return AjaxResult.success("鎾ら攢鎴愬姛"); + } else { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触"); + } -// transitionService.updateTbTransitionByTjNum(tjNum); - return AjaxResult.success("鎾ら攢鎴愬姛!!!"); + } } return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!"); } @@ -2714,7 +3019,9 @@ @Transactional public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) { - TjOrder order = new TjOrder(); + LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TjOrder::getCardId, cardId); + TjOrder order = tjOrderService.getOne(queryWrapper); order.setCardId(cardId); String configByKey = configService.selectConfigByKey("sfkqdyhis"); if (configByKey.equals("Y")) { @@ -2734,7 +3041,7 @@ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮h�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖"); } else { - boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order); + boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order)); if (zfHisApiMethods) { return AjaxResult.success("鎾ら攢鎴愬姛", map); } else { @@ -2775,18 +3082,18 @@ TjOrder order = tjOrderService.getOrderByTjNum(tjNum); if (null != order) { - LambdaQueryWrapper<TjProBl> wq=new LambdaQueryWrapper<>(); - wq.eq(TjProBl::getTjh,tjNum); + LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>(); + wq.eq(TjProBl::getTjh, tjNum); List<TjProBl> blList = blService.list(wq); - if(null !=blList && blList.size()>0){ + if (null != blList && blList.size() > 0) { for (TjProBl bl : blList) { - LambdaQueryWrapper<TjOrderRemark>wqr=new LambdaQueryWrapper<>(); - wqr.eq(TjOrderRemark::getJxbz,bl.getBldh()); + LambdaQueryWrapper<TjOrderRemark> wqr = new LambdaQueryWrapper<>(); + wqr.eq(TjOrderRemark::getJxbz, bl.getBldh()); List<TjOrderRemark> remarkList = remarkService.list(wqr); - if(null !=remarkList && remarkList.size()>0){ + if (null != remarkList && remarkList.size() > 0) { List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList()); - LambdaQueryWrapper<TjProject> wqp=new LambdaQueryWrapper<>(); - wqp.in(TjProject::getProId,collect); + LambdaQueryWrapper<TjProject> wqp = new LambdaQueryWrapper<>(); + wqp.in(TjProject::getProId, collect); List<TjProject> projectList = projectService.list(wqp); for (TjProject project : projectList) { project.setChildren(projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()))); @@ -2802,70 +3109,205 @@ } - @PostMapping("/revokeBlProByBldhAndTjh") @ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�") - @Transactional +// @Transactional public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) { - if(null ==dto.getBldhs() || dto.getBldhs().size()==0){ + if (null == dto.getBldhs() || dto.getBldhs().size() == 0) { + log.info("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�"); return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�"); } TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh()); if (null != order) { String configByKey = configService.selectConfigByKey("sfkqdyhis"); - if(null !=configByKey && configByKey.equals("Y")){ + if (null != configByKey && configByKey.equals("Y")) { + log.info("dto鐨勬暟鎹槸" + JSONUtil.toJsonStr(dto)); HashMap<String, Object> hisRequestParams = new HashMap<>(); - hisRequestParams.put("patientId",order.getCardId()); + hisRequestParams.put("patientId", order.getCardId()); AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams); + log.info("queryPay ->{}", JSONUtil.toJsonStr(queryPay)); if (Integer.parseInt(queryPay.get("code").toString()) == 200) { List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data"); - BigDecimal cateFeeAll = BigDecimal.ZERO; - List<String> advIds=new ArrayList<>(); - for (Map<String, String> datum : data) { - String advId = datum.get("Adv_Id").split("_")[1]; - BigDecimal cateFee = new BigDecimal(datum.get("CateFee")); - cateFeeAll = cateFeeAll.add(cateFee); - advIds.add(advId); - } - if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO)!=0 ){ - return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!"); + log.info("data鐨勬暟鎹槸" + JSONUtil.toJsonStr(data)); +// BigDecimal cateFeeAll = BigDecimal.ZERO; +// List<String> advIds = new ArrayList<>(); + List<LtkjJianchajianyanTree> buLuXmXinXi = tjOrderService.getBuLuXmXinXi(dto.getBldhs(), order.getCardId()); + log.info("buLuXmXinXi鐨勫�间负:==========" + buLuXmXinXi); + if (null != buLuXmXinXi && !buLuXmXinXi.isEmpty()) { + for (Map<String, String> datum : data) { + for (LtkjJianchajianyanTree tree : buLuXmXinXi) { + String advId = datum.get("Adv_Id").split("_")[1]; + log.info("advid鐨勫�间负:==========" + advId); + log.info("tree鐨勫�间负:==========" + advId); + BigDecimal cateFee = new BigDecimal(datum.get("CateFee")); + log.info("cateFee鐨勫�间负:==========" + cateFee); + log.info("tree.getFyhj()鐨勫�间负:==========" + tree.getFyhj()); + if (tree.getSqdh().equals(advId) && cateFee.compareTo(new BigDecimal(tree.getFyhj())) == 0) { + log.info("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢"); + return AjaxResult.error("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢!!!"); + } + } + } } } + + boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order); + if (!b) { +// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + log.info("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触"); + return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触"); + } } - for (String bldh : dto.getBldhs()) { - remarkService.deleteTjOrderDetailByjxbz(bldh); - tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh); - tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh); - transitionService.deleteTjOrderDetailByjxbz(bldh); - blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh,dto.getTjh()).eq(TjProBl::getBldh,bldh)); + try { + extracted(dto, order); + } catch (Exception e) { + log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�"); + return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!"); } return AjaxResult.success(); } return AjaxResult.error(); } + // @Transactional(propagation =Propagation.REQUIRES_NEW) + public void extracted(TjProBlDto dto, TjOrder order) { + for (String bldh : dto.getBldhs()) { + remarkService.deleteTjOrderDetailByjxbz(bldh); + tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh); + tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh); + transitionService.deleteTjOrderDetailByjxbz(bldh); + blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh)); + } + tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(), order.getUserId(), dto.getBldhs()); + } + @PostMapping("/addYaoPinShenQing") @ApiOperation(value = "鑽搧淇℃伅鐢宠") @Transactional - public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto){ + public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto) { AjaxResult result = controller.Outpinmedicapply(dto); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); - if(null !=code && code.equals("200")){ + if (null != code && code.equals("0")) { } return AjaxResult.success(); } + @GetMapping("/chushenyemianqijianjiekou") + @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛") + @Transactional + public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) { + LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>(); + wq.eq(TjOrderRemark::getTjNumber, tjNUm); + wq.eq(TjOrderRemark::getProId, proId); + TjOrderRemark remark = remarkService.getOne(wq); + remark.setType(2); + remarkService.updateById(remark); + return AjaxResult.success("鎿嶄綔鎴愬姛!"); + } + + + @PostMapping("/zongjanyemianshjianzhou") + @ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�") + @Transactional + public AjaxResult zongjanyemianshjianzhou(@RequestBody List<String> tjNUms) { + + if(null !=tjNUms && !tjNUms.isEmpty()){ + List<Map<String,Object>> list=new ArrayList<>(); + for (String tjNUm : tjNUms) { + Map<String,Object> map=new HashMap<>(); + TjOrder order = tjOrderService.getOrderByTjNum(tjNUm); + if (null != order) { + int czwj = remarkService.panduaniscunzaiweijian(tjNUm); + int sfwc = remarkService.panduaniswancheng(tjNUm); + Date checkTime = order.getCheckTime(); + Date reportTime = order.getReportTime(); + Integer heshouStatus = order.getHeshouStatus(); + Date lastTime = order.getPrintLastTime(); + int a=0; + if (czwj == 0) { + //鏈 + a=0; + } + if (czwj > 0) { + //鍦ㄦ + a=1; + } + if (sfwc == 0) { + //宸插畬鎴� + a=2; + } + if (null != checkTime) { + //宸插鏍� + a=3; + } + if (null != reportTime) { + //鐢熸垚鎶ュ憡 + a=4; + } + if (heshouStatus==1) { + //鎶ュ憡鏍告敹 + a=5; + } + if (null != lastTime) { + //宸插嚭鎶ュ憡 + a=6; + } + map.put("tjNUm",tjNUm); + map.put("sjz",a); + list.add(map); + } + } + return AjaxResult.success(list); + } + return AjaxResult.error(); + } + @PostMapping("/heshouchexiao") + @ApiOperation(value = "鎾ら攢鎶ュ憡鎺ュ彛") + @Transactional + public AjaxResult heshouchexiao(@RequestBody List<String> tjNUms) { + if(null !=tjNUms && !tjNUms.isEmpty()){ + + // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參 + //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛� + LambdaQueryWrapper<TjReport> wq1 = new LambdaQueryWrapper<>(); + wq1.select(TjReport::getReId); + wq1.in(TjReport::getTjNumber, tjNUms); + wq1.eq(TjReport::getPrint, "pdf"); + List<Long> list = tjReportService.list(wq1).stream().map(TjReport::getReId).collect(Collectors.toList()); + for (String tjNUm : tjNUms) { + TjOrder order = tjOrderService.getOrderByTjNum(tjNUm); + if(null !=order){ + order.setHeshouStatus(0); + order.setHeshouTime(null); + order.setHeshouDoctor(null); + order.setPrintLastTime(null); + order.setReportTime(null); + order.setStatus(TjConstants.TJ_WAIT); + if (!tjOrderService.updateById(order)) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error("鎿嶄綔澶辫触"); + } + } + } + int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{})); + if (i == 0) { + return AjaxResult.error("鎾ゅ洖澶辫触锛�"); + } + return AjaxResult.success("鎿嶄綔鎴愬姛"); + } + return AjaxResult.error(); + } } -- Gitblit v1.8.0