ltkj_peis.git - gitblit

			@@ -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,10 @@

			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.crypto.symmetric.DES;
			import cn.hutool.extra.pinyin.PinyinUtil;
			import cn.hutool.json.JSONArray;
			@@ -29,17 +33,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 +55,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 +71,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;
			@@ -92,6 +102,8 @@
			import com.ltkj.common.utils.poi.ExcelUtil;
			import com.ltkj.common.core.page.TableDataInfo;

			import static com.ltkj.web.config.pdfutils.PDFBinaryUtil.getPDFBinary;

			/**
			* 体检记录Controller
			*
			@@ -99,8 +111,8 @@
			* @date 2022-11-21
			*/
			@RestController
			@RequestMapping ("/hosp/order")
			@Api (tags = "PC端 ----体检记录接口")
			@RequestMapping("/hosp/order")
			@Api(tags = "PC端 ----体检记录接口")
			@Slf4j
			public class TjOrderController extends BaseController {
			@Resource
			@@ -125,7 +137,7 @@
			private ITbTransitionService transitionService;
			@Resource
			private ISysConfigService configService;
			@Value ("${path.filePath}")
			@Value("${path.filePath}")
			private String value;
			@Resource
			private ITjOrderRemarkService remarkService;
			@@ -133,61 +145,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 +191,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) {
			@@ -217,8 +243,8 @@
			* 查询体检记录列表
			*/
			// @PreAuthorize("@ss.hasPermi('hosp:order:list')")
			@GetMapping ("/list")
			@ApiOperation (value = "查询体检记录列表(默认)")
			@GetMapping("/list")
			@ApiOperation(value = "查询体检记录列表(默认)")
			public TableDataInfo list(TjOrder tjOrder) {
			startPage();
			startOrderBy();
			@@ -251,16 +277,16 @@
			}


			@GetMapping ("/getWenJuanList")
			@ApiOperation (value = "查询体检记录列表")
			public AjaxResult getWenJuanList(@ApiParam (value = "页码数(默认1)") @RequestParam (defaultValue = "1") Integer pageNum,
			@ApiParam (value = "显示条数(默认10)") @RequestParam (defaultValue = "10") Integer pageSize,
			@ApiParam (value = "体检号") @RequestParam (required = false) String tjNum,
			@ApiParam (value = "姓名") @RequestParam (required = false) String name,
			@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) {
			@GetMapping("/getWenJuanList")
			@ApiOperation(value = "查询体检记录列表")
			public AjaxResult getWenJuanList(@ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer pageNum,
			@ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
			@ApiParam(value = "体检号") @RequestParam(required = false) String tjNum,
			@ApiParam(value = "姓名") @RequestParam(required = false) String name,
			@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) {
			Map<String, Object> map = new HashMap<>();
			if (null != name) {
			LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
			@@ -380,23 +406,23 @@
			}


			@GetMapping ("/getOrderList")
			@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) 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) {
			@GetMapping("/getOrderList")
			@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) 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) {
			Map<String, Object> map = new HashMap<>();
			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) {
			if (null != customerList && !customerList.isEmpty()) {
			List<TjOrder> list = new ArrayList<>();
			for (TjCustomer customer : customerList) {
			LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
			@@ -407,7 +433,7 @@
			list.addAll(tjOrderService.list(wq));
			}
			List<TjOrder> collect = null;
			if (list.size() > 0) {
			if (!list.isEmpty()) {
			for (TjOrder order : list) {
			TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
			if (null != tjCustomer) {
			@@ -423,18 +449,25 @@
			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());
			}
			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()));
			}
			}
			collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
			@@ -482,18 +515,23 @@
			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());
			}else
			if (null != dwDeptService.getById(order.getPacId())) {
			order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
			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()));
			}
			}
			}
			@@ -503,30 +541,36 @@
			}


			@GetMapping ("/getOrderListOO")
			@ApiOperation (value = "体检报告页面——体检记录列表")
			public AjaxResult getOrderListOO(@ApiParam (value = "页码数(默认1)") @RequestParam (defaultValue = "1") Integer pageNum,
			@ApiParam (value = "显示条数(默认10)") @RequestParam (defaultValue = "10") Integer pageSize,
			@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) {
			@GetMapping("/getOrderListOO")
			@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(defaultValue = "0") Integer dyzt,
			@ApiParam(value = "体检号)") @RequestParam(required = false) String tjNum,
			@ApiParam(value = "姓名)") @RequestParam(required = false) String 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<>();
			if (null != name) {
			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) {
			if (null != customerList && !customerList.isEmpty()) {
			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才能打印
			if (dyzt == 0) {
			wq.isNull(TjOrder::getPrintLastTime);
			wq.eq(TjOrder::getHeshouStatus, 1);
			} else {
			wq.isNotNull(TjOrder::getPrintLastTime);
			}
			list.addAll(tjOrderService.list(wq));
			}
			List<TjOrder> collect = null;
			if (list.size() > 0) {
			if (!list.isEmpty()) {

			for (int i = 0; i < list.size(); i++) {
			TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
			@@ -536,14 +580,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).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
			list.get(i).setTjCustomerName(tjCustomer.getCusName());
			list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
			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())) {
			list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
			@@ -552,16 +601,6 @@
			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());
			}
			@@ -575,17 +614,90 @@
			}

			}
			if (StringUtil.isNotBlank(dw)) {
			LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
			wqq.like(TjCustomer::getCompName,dw);
			List<TjCustomer> customerList = tjCustomerService.list(wqq);
			List<TjOrder> list = new ArrayList<>();
			if (null != customerList && !customerList.isEmpty()) {
			for (TjCustomer customer : customerList) {
			LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
			wq.eq(TjOrder::getUserId, customer.getCusId());
			if (dyzt == 0) {
			wq.isNull(TjOrder::getPrintLastTime);
			wq.eq(TjOrder::getHeshouStatus, 1);
			} else {
			wq.isNotNull(TjOrder::getPrintLastTime);
			}
			list.addAll(tjOrderService.list(wq));
			}
			}
			List<String> dwIds= iDictCompService.getdwIdByDwName(dw);

			LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
			wq.in(TjOrder::getFirmId,dwIds);
			list.addAll(tjOrderService.list(wq));
			List<TjOrder> collect = null;
			if (!list.isEmpty()) {
			List<TjOrder> orders = list.stream().distinct().collect(Collectors.toList());
			for (int i = 0; i < orders.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(tjCustomer.getCusName());
			list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
			list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());

			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())) {
			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());
			}
			}
			}
			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);


			}
			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);
			wq.orderByDesc(TjOrder::getCreateTime);
			Page<TjOrder> page2 = tjOrderService.page(page1, wq);
			List<TjOrder> list = page2.getRecords();
			if (list != null) {
			@@ -597,15 +709,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())) {
			@@ -616,14 +732,14 @@
			}
			}
			//从打印记录查出最新打印时间
			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);
			@@ -632,15 +748,15 @@
			}


			@GetMapping ("/getPrintOrderList")
			@ApiOperation (value = "体检发票打印接口")
			public AjaxResult getPrintOrderList(@ApiParam (value = "页码数(默认1)") @RequestParam (defaultValue = "1") Integer pageNum,
			@ApiParam (value = "显示条数(默认10)") @RequestParam (defaultValue = "10") Integer pageSize,
			@ApiParam (value = "体检号)") @RequestParam (required = false) String tjNum,
			@ApiParam (value = "已打印未打印0未打印1已打印)") @RequestParam (required = false) Integer type,
			@ApiParam (value = "姓名") @RequestParam (required = false) String name,
			@ApiParam (value = "报告开始时间") @RequestParam (required = false) Date bgbeginTime,
			@ApiParam (value = "报告结束时间") @RequestParam (required = false) Date bgendTime) {
			@GetMapping("/getPrintOrderList")
			@ApiOperation(value = "体检发票打印接口")
			public AjaxResult getPrintOrderList(@ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer pageNum,
			@ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
			@ApiParam(value = "体检号)") @RequestParam(required = false) String tjNum,
			@ApiParam(value = "已打印未打印0未打印1已打印)") @RequestParam(required = false) Integer type,
			@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<>();
			List<TjOrder> collect = null;
			if (null != name) {
			@@ -831,9 +947,9 @@
			* 导出体检记录列表
			*/
			// @PreAuthorize("@ss.hasPermi('hosp:order:export')")
			@Log (title = "体检记录", businessType = BusinessType.EXPORT)
			@PostMapping ("/export")
			@ApiOperation (value = "导出体检记录列表")
			@Log(title = "体检记录", businessType = BusinessType.EXPORT)
			@PostMapping("/export")
			@ApiOperation(value = "导出体检记录列表")
			public void export(HttpServletResponse response, TjOrder tjOrder) {
			//List<TjOrder> list = tjOrderService.selectTjOrderList(tjOrder);
			List<TjOrder> list = tjOrderService.selectExportOrderList(tjOrder);
			@@ -845,15 +961,15 @@
			* 获取体检记录详细信息
			*/
			// @PreAuthorize("@ss.hasPermi('hosp:order:query')")
			@GetMapping (value = "/{orderId}")
			@ApiOperation (value = "获取体检记录详细信息")
			public AjaxResult getInfo(@PathVariable ("orderId") Long orderId) {
			@GetMapping(value = "/{orderId}")
			@ApiOperation(value = "获取体检记录详细信息")
			public AjaxResult getInfo(@PathVariable("orderId") Long orderId) {
			return success(tjOrderService.selectTjOrderByOrderId(orderId));
			}


			@GetMapping ("/getIsRequired")
			@ApiOperation (value = "根据参数配置获取是否必填项（身份证、性别、电话、照片、是否直接下单）")
			@GetMapping("/getIsRequired")
			@ApiOperation(value = "根据参数配置获取是否必填项（身份证、性别、电话、照片、是否直接下单）")
			public AjaxResult getIsRequired() {
			Map<String, String> res = new HashMap<>();
			res.put("has_idcard", configService.selectConfigByKey("has_idcard"));
			@@ -868,9 +984,14 @@
			/**
			* 体检签到登记接口
			*/


			ReentrantLock lock = new ReentrantLock();

			@PostMapping
			@ApiOperation (value = "体检签到登记接口")
			@Transactional //(切换数据库出错，所以注释)
			@ApiOperation(value = "体检签到登记接口")
			// @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);
			@@ -892,8 +1013,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);
			@@ -902,10 +1022,10 @@
			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(DateUtil.offsetDay(tjReservation.getReservationTime(),tjReservation.getYxts())).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("对不起您的预约已超时请重新预约");
			@@ -920,18 +1040,16 @@
			tjOrder.setGroupId(tjReservation.getGroupingId());
			tjOrder.setFirmDeptId(tjReservation.getPacId());
			}
			// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
			// 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 != tjOrder.getPhoto()) {
			File file = new File(tjOrder.getPhoto());
			if (file.isFile()) {
			@@ -958,9 +1076,34 @@
			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();
			@@ -972,9 +1115,7 @@
			Long cusNumber = tjCustomer.getCusNumber();
			cusNumber += 1;
			tjCustomer.setCusNumber(cusNumber);
			BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
			TjFlowingWater tjFlowingWater = new TjFlowingWater();
			tjFlowingWater.setPayStasus(0L);

			if ("1".equals(tjOrder.getTjType())) {
			if (null != tjReservation && tjReservation.getPayType() == 1) {
			tjFlowingWater.setPayStasus(3L);
			@@ -1026,14 +1167,12 @@
			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);


			}

			//修改每项的原价现价 //修改临时表体检号
			@@ -1042,28 +1181,41 @@
			/调用his接口/
			String config = configService.selectConfigByKey("sfkqdyhis");
			if (null != config && config.equals("Y")) {
			AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer,tjOrder);
			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()){
			if (null != jzh && null != jzh.toString()) {
			hisApiMethod.ZfHisApiMethod(jzh.toString());
			}
			log.info("该登记人挂号失败, 就诊号为: " + tjOrder.getCardId());
			return AjaxResult.error("挂号失败!" + result.get("msg").toString());
			}

			log.info("该登记人的his就诊号是: "+tjOrder.getCardId());
			log.info("该登记人的his就诊号是: " + tjOrder.getCardId());
			//团体
			if ("1".equals(tjOrder.getTjType())) {
			asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
			// 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);
			}
			hisApiMethod.tijianshenqing(tjCustomer,DateUtil.format(date1,"yyyy-MM-dd HH:mm:ss"),tjOrder.getCardId());

			// 查询对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
			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());
			@@ -1073,30 +1225,122 @@
			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、Pacs申请如果类型包含在配置内则使用对接lis、pacs
			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());

			@PostMapping ("/addPlOrderAndDetail")
			@ApiOperation (value = "体检批量签到登记接口")
			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);
			}
			}
			}

			}
			}


			@PostMapping("/addPlOrderAndDetail")
			@ApiOperation(value = "体检批量签到登记接口")
			@Transactional //(切换数据库出错，所以注释)
			public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto, HttpServletResponse response) {
			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() {
			@@ -1109,7 +1353,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) {
			@@ -1488,9 +1732,9 @@
			* 修改体检记录
			*/
			// @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
			@Log (title = "体检记录", businessType = BusinessType.UPDATE)
			@Log(title = "体检记录", businessType = BusinessType.UPDATE)
			@PutMapping
			@ApiOperation (value = "修改体检记录")
			@ApiOperation(value = "修改体检记录")
			public AjaxResult edit(@RequestBody TjOrder tjOrder) {
			return toAjax(tjOrderService.updateTjOrder(tjOrder));
			}
			@@ -1499,16 +1743,16 @@
			* 删除体检记录
			*/
			// @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
			@Log (title = "体检记录", businessType = BusinessType.DELETE)
			@DeleteMapping ("/{orderIds}")
			@ApiOperation (value = "删除体检记录")
			@Log(title = "体检记录", businessType = BusinessType.DELETE)
			@DeleteMapping("/{orderIds}")
			@ApiOperation(value = "删除体检记录")
			public AjaxResult remove(@PathVariable Long[] orderIds) {
			return toAjax(tjOrderService.deleteTjOrderByOrderIds(orderIds));
			}

			@GetMapping ("/getOrderDetailByTjNumber")
			@ApiOperation (value = "根据体检号获取体检详情")
			public AjaxResult getOrderDetailByTjNumber(@RequestParam @ApiParam (value = "体检号") String tjNumber) {
			@GetMapping("/getOrderDetailByTjNumber")
			@ApiOperation(value = "根据体检号获取体检详情")
			public AjaxResult getOrderDetailByTjNumber(@RequestParam @ApiParam(value = "体检号") String tjNumber) {
			LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
			wq0.eq(TjOrder::getTjNumber, tjNumber);
			TjOrder tjOrder = tjOrderService.getOne(wq0);
			@@ -1528,8 +1772,8 @@
			return AjaxResult.success("暂无数据");
			}

			@PostMapping ("/addtTransition")
			@ApiOperation (value = "添加过渡表数据")
			@PostMapping("/addtTransition")
			@ApiOperation(value = "添加过渡表数据")
			@Transactional
			public AjaxResult addtTransition(@RequestBody Map<String, Object> map) {
			Object packId = map.get("pacId");
			@@ -1545,7 +1789,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);
			@@ -1554,150 +1798,44 @@
			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) {
			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);
			//异步保存数据库
			// 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 != 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) {
			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();
			}


			@GetMapping ("/getTransitionList")
			@ApiOperation (value = "查询过渡表数据")
			public AjaxResult getTransitionList(@RequestParam @ApiParam (value = "客户id") String cusId) {
			@GetMapping("/getTransitionList")
			@ApiOperation(value = "查询过渡表数据")
			public AjaxResult getTransitionList(@RequestParam @ApiParam(value = "客户id") String cusId) {
			if (redisCache.hasKey(cusId + "cusId")) {
			List<Map<String, Object>> list = redisCache.getCacheMapValue(cusId + "cusId", cusId);
			return AjaxResult.success(list);
			@@ -1712,16 +1850,16 @@
			}


			@GetMapping ("/getQianLiList")
			@ApiOperation (value = "查询体检记录列表")
			public AjaxResult getQianLiList(@ApiParam (value = "页码数(默认1)") @RequestParam (defaultValue = "1") Integer pageNum,
			@ApiParam (value = "显示条数(默认10)") @RequestParam (defaultValue = "10") Integer pageSize,
			@ApiParam (value = "体检号") @RequestParam (required = false) String tjNum,
			@ApiParam (value = "姓名") @RequestParam (required = false) String name,
			@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) {
			@GetMapping("/getQianLiList")
			@ApiOperation(value = "查询体检记录列表")
			public AjaxResult getQianLiList(@ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer pageNum,
			@ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
			@ApiParam(value = "体检号") @RequestParam(required = false) String tjNum,
			@ApiParam(value = "姓名") @RequestParam(required = false) String name,
			@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) {
			Map<String, Object> map = new HashMap<>();
			if (null != name) {
			LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
			@@ -1830,9 +1968,9 @@
			/**
			* 签离弃检确认返回数据
			*/
			@GetMapping ("/abandon")
			@ApiOperation (value = "签离弃检确认返回数据")
			public AjaxResult abandon(@RequestParam @ApiParam (value = "体检号") String tjNumber) {
			@GetMapping("/abandon")
			@ApiOperation(value = "签离弃检确认返回数据")
			public AjaxResult abandon(@RequestParam @ApiParam(value = "体检号") String tjNumber) {
			LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
			wq.eq(TjOrderRemark::getTjNumber, tjNumber);
			List<TjOrderRemark> remarkList = remarkService.list(wq);
			@@ -1857,8 +1995,8 @@
			*
			* @ApiParam(value = "体检号") String tjNumber
			*/
			@PostMapping ("/tjGoOut")
			@ApiOperation (value = "体检签离")
			@PostMapping("/tjGoOut")
			@ApiOperation(value = "体检签离")
			@Transactional
			public AjaxResult tjGoOut(@RequestBody Map<String, Object> map) {
			Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
			@@ -1889,6 +2027,7 @@
			}
			}
			}
			remarkService.updateRemark(tjNumber);
			asyncService.tjGoutAsync(domainVos, sysUser, list);

			TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
			@@ -1923,9 +2062,9 @@
			dto.setJzqk(9);
			controller.Outpinimpapply(dto);
			}*/

			return AjaxResult.success("签离成功！");
			} else {
			remarkService.updateRemark(tjNumber);
			return getAjaxResult(tjNumber);
			}
			}
			@@ -1934,10 +2073,10 @@
			/**
			* 签离
			*/
			@GetMapping ("/goOut")
			@ApiOperation (value = "签离")
			@GetMapping("/goOut")
			@ApiOperation(value = "签离")
			@Transactional
			public AjaxResult goOut(@RequestParam @ApiParam (value = "体检号") String tjNumber) {
			public AjaxResult goOut(@RequestParam @ApiParam(value = "体检号") String tjNumber) {
			return getAjaxResult(tjNumber);
			}

			@@ -1945,9 +2084,9 @@
			/**
			* 核销订单接口
			*/
			@GetMapping ("/orderShip")
			@ApiOperation (value = "PC端手动核销订单接口")
			public AjaxResult orderShip(@RequestParam @ApiParam (value = "体检号") String tjNum) {
			@GetMapping("/orderShip")
			@ApiOperation(value = "PC端手动核销订单接口")
			public AjaxResult orderShip(@RequestParam @ApiParam(value = "体检号") String tjNum) {
			if (tjNum == null) {
			return AjaxResult.error();
			}
			@@ -2114,15 +2253,15 @@
			}


			@GetMapping ("/tuanTiListById")
			@ApiOperation (value = "查询团体体检状态")
			public AjaxResult tuanTiListById(@ApiParam (value = "页码数(默认1)") @RequestParam (defaultValue = "1") Integer pageNum,
			@ApiParam (value = "显示条数(默认10)") @RequestParam (defaultValue = "10") Integer pageSize,
			@ApiParam (value = "单位") @RequestParam String firmId,
			@ApiParam (value = "部门") @RequestParam (required = false) String dwDeptId,
			@ApiParam (value = "分组") @RequestParam (required = false) String groupId,
			@ApiParam (value = "登记开始时间") @RequestParam Date beginTime,
			@ApiParam (value = "登记结束时间") @RequestParam Date endTime) {
			@GetMapping("/tuanTiListById")
			@ApiOperation(value = "查询团体体检状态")
			public AjaxResult tuanTiListById(@ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer pageNum,
			@ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
			@ApiParam(value = "单位") @RequestParam String firmId,
			@ApiParam(value = "部门") @RequestParam(required = false) String dwDeptId,
			@ApiParam(value = "分组") @RequestParam(required = false) String groupId,
			@ApiParam(value = "登记开始时间") @RequestParam Date beginTime,
			@ApiParam(value = "登记结束时间") @RequestParam Date endTime) {
			Map<String, Object> map = new HashMap<>();
			int a = 0;
			int b = 0;
			@@ -2187,11 +2326,11 @@
			}


			@GetMapping ("/tuanTiBingById")
			@ApiOperation (value = "查询团体体检病种详细信息")
			public AjaxResult tuanTiBingById(@ApiParam (value = "单位") @RequestParam String firmId,
			@ApiParam (value = "部门") @RequestParam String firmDeptId,
			@ApiParam (value = "病种") @RequestParam (required = false) String bingZhong) {
			@GetMapping("/tuanTiBingById")
			@ApiOperation(value = "查询团体体检病种详细信息")
			public AjaxResult tuanTiBingById(@ApiParam(value = "单位") @RequestParam String firmId,
			@ApiParam(value = "部门") @RequestParam String firmDeptId,
			@ApiParam(value = "病种") @RequestParam(required = false) String bingZhong) {
			List<TjOrderDetailRules> res1 = new ArrayList<>();
			List<BingZhongVO> res = new ArrayList<>();

			@@ -2250,8 +2389,8 @@
			}


			@PostMapping ("/tuanTiBingChart")
			@ApiOperation (value = "查询团体体检病种统计图")
			@PostMapping("/tuanTiBingChart")
			@ApiOperation(value = "查询团体体检病种统计图")
			public AjaxResult tuanTiBingChart(@RequestBody BingZhongVO bingZhongVO) {
			List<TjOrderDetailRules> res1 = new ArrayList<>();

			@@ -2290,18 +2429,18 @@
			}


			@PostMapping ("/deletedTbTransitionByCusId")
			@ApiOperation (value = "根据身份证号删除临时表数据")
			public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam (value = "身份证号") String cusId) {
			@PostMapping("/deletedTbTransitionByCusId")
			@ApiOperation(value = "根据身份证号删除临时表数据")
			public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "身份证号") String cusId) {
			LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
			wq.between(TbTransition::getCreateTime, transitionService.getTbTransitionCreateTimeByCusId(cusId), new Date());
			wq.eq(TbTransition::getCusId, cusId);
			return AjaxResult.success(transitionService.remove(wq));
			}

			@GetMapping ("/getTransitionInfo")
			@ApiOperation (value = "根据体检号获取汇总和明细的数据")
			public AjaxResult getTransitionInfo(@RequestParam ("tjNumber") String tjNumber) {
			@GetMapping("/getTransitionInfo")
			@ApiOperation(value = "根据体检号获取汇总和明细的数据")
			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)
			@@ -2358,15 +2497,17 @@
			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()),tjOrder.getCardId());
			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.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()),tjOrder.getCardId());
			tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());

			//添加remark表数据
			if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
			@@ -2390,30 +2531,224 @@
			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);
			}
			}


			@PostMapping ("/heXiaoByIds/{orderIds}")
			@ApiOperation (value = "核收报告——————总检审核通过后可以核销，核收后才能打印")
			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/{orderIds}")
			@ApiOperation(value = "核收报告——————总检审核通过后可以核销，核收后才能打印")
			@Transactional
			@RepeatSubmit
			public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
			Date date = new Date();
			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("核收失败");
			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::getReportTime, new Date());
			updateWrapper.set(TjOrder::getPrintLastTime, new Date());
			updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
			updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
			tjOrderService.update(updateWrapper);
			}
			String hisRegistrationId = byId.getCardId();
			Date createTime = byId.getCreateTime();
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			String ksrq = dateFormat.format(createTime);
			String jsrq = dateFormat.format(date);
			HashMap<String, Object> params = new HashMap<>();
			params.put("his_registration_id", hisRegistrationId);
			params.put("ksbm", "");
			params.put("pationid", "");
			params.put("ksrq", ksrq);
			params.put("jsrq", jsrq);
			params.put("pagecount", 100);
			params.put("page", 1);
			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);
			byId.setReportTime(date);
			byId.setPrintLastTime(date);
			byId.setDownloadLastTime(date);
			} 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("核收成功");
			}

			@GetMapping ("/getHistryTjOrderByCusIdCard")
			@ApiOperation (value = "根据身份证号查看历史体检记录")

			public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
			// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
			// AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
			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);
			// Date date = new Date();
			// tjOrder.setStatus(TjConstants.TJ_END);
			// tjOrder.setReportTime(date);
			// tjOrder.setPrintLastTime(date);
			// tjOrder.setDownloadLastTime(date);
			// tjOrderService.updateById(tjOrder);
			}
			return ajaxResult;
			}

			@GetMapping("/getHistryTjOrderByCusIdCard")
			@ApiOperation(value = "根据身份证号查看历史体检记录")
			@Transactional
			public AjaxResult getHistryTjOrderByCusIdCard(@RequestParam String cusIdCard) {
			TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
			@@ -2433,8 +2768,8 @@
			}


			@GetMapping ("/getHistryTjOrderProByCusIdCard")
			@ApiOperation (value = "根据身份证号查看历史体检项目记录")
			@GetMapping("/getHistryTjOrderProByCusIdCard")
			@ApiOperation(value = "根据身份证号查看历史体检项目记录")
			@Transactional
			public AjaxResult getHistryTjOrderProByCusIdCard(@RequestParam String cusIdCard) {
			TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
			@@ -2493,8 +2828,8 @@
			}


			@GetMapping ("/getHistryTjOrderByCusId")
			@ApiOperation (value = "根据客户id查看历史体检记录")
			@GetMapping("/getHistryTjOrderByCusId")
			@ApiOperation(value = "根据客户id查看历史体检记录")
			@Transactional
			public AjaxResult getHistryTjOrderByCusId(@RequestParam String cusId) {
			TjCustomer tjCustomer = tjCustomerService.getById(cusId);
			@@ -2528,10 +2863,10 @@
			}


			@GetMapping ("/revokeTjOrderByTjNum")
			@ApiOperation (value = "根据客户体检号撤销体检记录")
			@GetMapping("/revokeTjOrderByTjNum")
			@ApiOperation(value = "根据客户体检号撤销体检记录")
			@Transactional
			public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam (value = "体检号") String tjNum) {
			public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam(value = "体检号") String tjNum) {

			TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
			if (null != order) {
			@@ -2539,6 +2874,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);
			@@ -2549,6 +2885,7 @@
			customer.setCardId("0");
			tjCustomerService.updateById(customer);
			String configByKey = configService.selectConfigByKey("sfkqdyhis");
			tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
			if (configByKey.equals("Y")) {

			HashMap<String, Object> hisRequestParams = new HashMap<>();
			@@ -2567,7 +2904,7 @@
			return AjaxResult.error("撤销失败,该人员已缴费,请先退费!");
			}
			}
			boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
			boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
			if (zfHisApiMethods) {
			return AjaxResult.success("撤销成功");
			} else {
			@@ -2576,20 +2913,19 @@
			}

			}
			return AjaxResult.success("撤销成功!!!");
			}
			return AjaxResult.success("签到记录不存在!");
			}


			@GetMapping ("/getCusTomterListByCompId")
			@ApiOperation (value = "获取单位id体检人信息接口")
			public AjaxResult getCusTomterListByCompId(@RequestParam (required = false) @ApiParam (value = "单位id") String compId,
			@RequestParam (required = false) @ApiParam (value = "名字") String name,
			@RequestParam (required = false) @ApiParam (value = "部门id") String deptId,
			@RequestParam (required = false) @ApiParam (value = "预约时间") Date reservationTime,
			@RequestParam (defaultValue = "1") Integer page,
			@RequestParam (defaultValue = "10") Integer pageSize) {
			@GetMapping("/getCusTomterListByCompId")
			@ApiOperation(value = "获取单位id体检人信息接口")
			public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "单位id") String compId,
			@RequestParam(required = false) @ApiParam(value = "名字") String name,
			@RequestParam(required = false) @ApiParam(value = "部门id") String deptId,
			@RequestParam(required = false) @ApiParam(value = "预约时间") Date reservationTime,
			@RequestParam(defaultValue = "1") Integer page,
			@RequestParam(defaultValue = "10") Integer pageSize) {
			Page<TjReservation> pages = new Page<>(page, pageSize);
			LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
			if (null != compId) wq.eq(TjReservation::getCompanyId, compId);
			@@ -2615,10 +2951,10 @@
			}


			@PostMapping ("/plRevokeTjOrderByTjNum")
			@ApiOperation (value = "根据客户体检号批量撤销体检记录")
			@PostMapping("/plRevokeTjOrderByTjNum")
			@ApiOperation(value = "根据客户体检号批量撤销体检记录")
			@Transactional
			public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam (value = "预约主键id集合") List<String> reservationIds) {
			public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "预约主键id集合") List<String> reservationIds) {
			if (null != reservationIds && reservationIds.size() > 0) {
			LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
			wq1.in(TjOrder::getReservationId, reservationIds);
			@@ -2652,8 +2988,8 @@
			return AjaxResult.error("请选择要撤销的人员!");
			}

			@PostMapping ("makeTjPDF")
			@ApiOperation (value = "批量生成PDF")
			@PostMapping("makeTjPDF")
			@ApiOperation(value = "批量生成PDF")
			public AjaxResult makeTjPDF(@RequestBody List<String> reservations) {
			QueryWrapper<TjOrder> queryWrapper = new QueryWrapper<>();
			queryWrapper.in("reservation_id", reservations);
			@@ -2695,11 +3031,11 @@
			}


			@GetMapping ("/delTbBycusCardIdAndProId")
			@ApiOperation (value = "根据客户身份证号和项目父项id删除临时表数据")
			@GetMapping("/delTbBycusCardIdAndProId")
			@ApiOperation(value = "根据客户身份证号和项目父项id删除临时表数据")
			@Transactional
			public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam (value = "身份证号") String cusCardId,
			@RequestParam @ApiParam (value = "父项id") String proId) {
			public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "身份证号") String cusCardId,
			@RequestParam @ApiParam(value = "父项id") String proId) {

			if (transitionService.delTbBycusCardIdAndProId(cusCardId, proId)) {
			return AjaxResult.success();
			@@ -2708,12 +3044,14 @@
			}


			@GetMapping ("/revokeTjOrderByTjCardId")
			@ApiOperation (value = "根据就诊号撤销申请记录")
			@GetMapping("/revokeTjOrderByTjCardId")
			@ApiOperation(value = "根据就诊号撤销申请记录")
			@Transactional
			public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam (value = "就诊号") String cardId) {
			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")) {
			@@ -2733,7 +3071,7 @@
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return AjaxResult.error("撤销失败,门诊患者费用清单信息不为空");
			} else {
			boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
			boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
			if (zfHisApiMethods) {
			return AjaxResult.success("撤销成功", map);
			} else {
			@@ -2746,10 +3084,10 @@
			}


			@GetMapping ("/revokeTjOrderByTjh")
			@ApiOperation (value = "根据就体检号删除记录")
			@GetMapping("/revokeTjOrderByTjh")
			@ApiOperation(value = "根据就体检号删除记录")
			@Transactional
			public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam (value = "体检号") String tjNum) {
			public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "体检号") String tjNum) {

			TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
			if (null != order) {
			@@ -2767,10 +3105,10 @@
			}


			@GetMapping ("/getBlproByTjh")
			@ApiOperation (value = "根据体检号获取补录项目记录")
			@GetMapping("/getBlproByTjh")
			@ApiOperation(value = "根据体检号获取补录项目记录")
			@Transactional
			public AjaxResult getBlproByTjh(@RequestParam @ApiParam (value = "体检号") String tjNum) {
			public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "体检号") String tjNum) {

			TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
			if (null != order) {
			@@ -2801,12 +3139,13 @@
			}


			@PostMapping ("/revokeBlProByBldhAndTjh")
			@ApiOperation (value = "根据补录单号和体检号删除记录")
			@Transactional
			@PostMapping("/revokeBlProByBldhAndTjh")
			@ApiOperation(value = "根据补录单号和体检号删除记录")
			// @Transactional
			public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {

			if (null == dto.getBldhs() \|\| dto.getBldhs().size() == 0) {
			log.info("请选择要撤销的补录项目");
			return AjaxResult.error("请选择要撤销的补录项目");
			}

			@@ -2814,45 +3153,69 @@
			if (null != order) {
			String configByKey = configService.selectConfigByKey("sfkqdyhis");
			if (null != configByKey && configByKey.equals("Y")) {
			log.info("dto的数据是" + JSONUtil.toJsonStr(dto));
			HashMap<String, Object> hisRequestParams = new HashMap<>();
			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);
			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("该项目已缴费不可撤销!!!");
			}
			}
			}
			}
			if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
			return AjaxResult.error("改项目已缴费不可撤销!!!");
			}

			}

			boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
			if(!b){
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			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 = "药品信息申请")

			@PostMapping("/addYaoPinShenQing")
			@ApiOperation(value = "药品信息申请")
			@Transactional
			public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto) {
			AjaxResult result = controller.Outpinmedicapply(dto);
			@@ -2866,5 +3229,62 @@
			}


			@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(1);
			remarkService.updateById(remark);
			return AjaxResult.success("操作成功!");
			}



			@GetMapping("/zongjanyemianshjianzhou")
			@ApiOperation(value = "总检获取时间轴接口")
			@Transactional
			public AjaxResult zongjanyemianshjianzhou(@RequestParam String tjNUm) {
			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();
			if(czwj==0){
			//未检
			return AjaxResult.success(0);
			} else if(czwj>0) {
			//在检
			return AjaxResult.success(1);
			}else if(sfwc==0){
			//已完成
			return AjaxResult.success(2);
			}else if(null !=checkTime){
			//已审核
			return AjaxResult.success(3);
			}else if(null !=reportTime){
			//生成报告
			return AjaxResult.success(4);
			}else if(null !=heshouStatus){
			//报告核收
			return AjaxResult.success(5);
			}else if(null !=lastTime){
			//已出报告
			return AjaxResult.success(6);
			}else {
			return AjaxResult.error();
			}
			}
			return AjaxResult.error();
			}



			}