ltkj_peis.git - gitblit

			@@ -3,20 +3,20 @@
			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.date.DateTime;
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.util.IdUtil;
			import cn.hutool.json.JSONArray;
			import cn.hutool.json.JSONObject;
			import cn.hutool.json.JSONUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.ltkj.common.core.domain.AjaxResult;
			import com.ltkj.common.core.domain.entity.SysUser;
			import com.ltkj.common.core.redis.RedisCache;
			import com.ltkj.common.utils.SecurityUtils;
			import com.ltkj.common.utils.IdUtils;
			import com.ltkj.common.utils.StringUtils;
			import com.ltkj.framework.config.MatchUtils;
			import com.ltkj.hosp.domain.*;
			import com.ltkj.hosp.hisDto.OutpinexamapplyDto;
			import com.ltkj.hosp.hisDto.OutpintestapplyDetailsDto;
			import com.ltkj.hosp.hisDto.OutpintestapplyDto;
			import com.ltkj.hosp.hisDto.OutpintreatapplyDto;
			import com.ltkj.hosp.hisDto.*;
			import com.ltkj.hosp.pacsDto.SavePacsApply;
			import com.ltkj.hosp.service.*;
			import com.ltkj.hosp.vodomain.AddNewReservationConfirm;
			import com.ltkj.hosp.vodomain.LineChartsVo;
			@@ -24,9 +24,15 @@
			import com.ltkj.hosp.vodomain.QjDomainVo;
			import com.ltkj.mall.mallOrderUtils.TjConstants;
			import com.ltkj.system.service.ISysConfigService;
			import com.ltkj.system.service.ISysDeptService;
			import com.ltkj.system.service.ISysDictDataService;
			import com.ltkj.system.service.ISysUserService;
			import com.ltkj.web.controller.his.HisApiGetMethodService;
			import com.ltkj.web.controller.his.HisApiMethodService;
			import com.ltkj.web.controller.lis.LisApiMethod;
			import com.ltkj.web.controller.pacs.PacsApiMethodService;
			import com.ltkj.web.controller.system.SamplingServiceApi;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.scheduling.annotation.Async;
			import org.springframework.stereotype.Service;
			@@ -49,6 +55,7 @@
			* @Date: 2023/9/15 15:57
			*/

			@Slf4j
			@Service
			@Transactional
			public class TjSysAsyncServiceImpl implements TjAsyncService {
			@@ -126,6 +133,28 @@
			private TjProBlService blService;
			@Resource
			private ITjFlowingWaterService tjFlowingWaterService;
			@Resource
			private ISysDeptService deptService;
			@Autowired
			private TjCfService cfService;
			@Resource
			private LtkjHysqdService hysqdService;
			@Autowired
			private PacsApiMethodService pacsApiMethodService;
			@Autowired
			private LisApiMethod lisApiMethod;
			@Autowired
			private IdUtils idUtils;
			@Autowired
			private LtkjJybbzdService jybbzdService;
			@Autowired
			private LisJyflhbService lisJyflhbService;
			@Autowired
			private SamplingServiceApi samplingServiceApi;
			@Autowired
			private ISysDictDataService sysDictDataService;


			@Override
			public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
			long l = System.currentTimeMillis();
			@@ -152,7 +181,7 @@
			redisCache.deleteObject(tjCustomer.getCusIdcard() + "cusId");
			if (null != tbTransitionList && tbTransitionList.size() > 0) {

			tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
			tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());

			//修改每项的原价现价
			for (TbTransition transition : tbTransitionList) {
			@@ -204,10 +233,11 @@
			public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {

			tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
			boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
			boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
			String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
			if (!b) {
			List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
			if (null != proList && proList.size() > 0) {
			if (null != proList && !proList.isEmpty()) {
			for (TjGroupingPro groupingPro : proList) {
			TjOrderDetail detail = new TjOrderDetail();
			// if (null != transition.getPacId()) {
			@@ -260,11 +290,13 @@
			if (null != tjReservation && tjReservation.getPayType() == 1) {
			tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
			sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
			orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
			}
			}
			if (tjFlowingWater.getPayStasus() == 1) {
			tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
			sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
			orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
			}
			if (tjFlowingWater.getDiscount() == null) {
			transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
			@@ -272,7 +304,7 @@
			transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
			}

			tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
			tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
			// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
			// if (list != null) {
			// for (TjOrderDetail tjOrderDetail : list) {
			@@ -311,8 +343,8 @@
			@Override
			@Async("async")
			public void collectFees(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList, SysUser sysUser, String discount) {
			orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
			redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber());
			// orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
			// redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber());
			for (TbTransition transition : tbTransitionList) {
			// transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).divide(BigDecimal.valueOf(10))));
			// transitionService.updateById(transition);
			@@ -337,33 +369,33 @@
			//父项
			ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new));
			List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList());
			if (parentProIds.size() > 0) {
			if (!parentProIds.isEmpty()) {
			for (Long parentProId : parentProIds) {
			TjProject parentProject = projectService.selectTjProjectByProId(parentProId);
			if (null != parentProject) {
			LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
			wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
			List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
			if (null != proConsumables && proConsumables.size() > 0) {
			if (null != proConsumables && !proConsumables.isEmpty()) {
			for (TjProConsumables tjProConsumables : proConsumables) {
			TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
			list2.add(tjConsumables);
			}
			}
			TjOrderRemark tjOrderRemark = new TjOrderRemark();
			tjOrderRemark.setProId(parentProId);
			tjOrderRemark.setProName(parentProject.getProName());
			tjOrderRemark.setDeptId(parentProject.getDeptId());
			tjOrderRemark.setTjNumber(order.getTjNumber());
			tjOrderRemark.setCreateBy(sysUser.getNickName());
			tjOrderRemark.setCreateTime(new Date());
			tjOrderRemark.setUpdateBy(sysUser.getNickName());
			tjOrderRemark.setUpdateTime(new Date());
			tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
			tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
			orderRemarkService.save(tjOrderRemark);
			Map<String, Object> map = getOrderDetailByProParentId(String.valueOf(parentProId), order.getTjNumber());
			redisCache.setCacheMapValue("getOrderDetailByProParentId" + order.getTjNumber(), String.valueOf(parentProId), map);
			// TjOrderRemark tjOrderRemark = new TjOrderRemark();
			// tjOrderRemark.setProId(parentProId);
			// tjOrderRemark.setProName(parentProject.getProName());
			// tjOrderRemark.setDeptId(parentProject.getDeptId());
			// tjOrderRemark.setTjNumber(order.getTjNumber());
			// tjOrderRemark.setCreateBy(sysUser.getNickName());
			// tjOrderRemark.setCreateTime(new Date());
			// tjOrderRemark.setUpdateBy(sysUser.getNickName());
			// tjOrderRemark.setUpdateTime(new Date());
			// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
			// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
			// orderRemarkService.save(tjOrderRemark);
			// Map<String, Object> map = getOrderDetailByProParentId(String.valueOf(parentProId), order.getTjNumber());
			// redisCache.setCacheMapValue("getOrderDetailByProParentId" + order.getTjNumber(), String.valueOf(parentProId), map);
			}
			}
			}
			@@ -386,21 +418,41 @@
			chargingStandardService.save(tjChargingStandard);
			}

			LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
			wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
			wq.isNotNull(TjOrderDetail::getFlowingWaterId);
			wq.eq(TjOrderDetail::getIsSampling, 0);
			List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
			if (null != detailList && detailList.size() > 0) {
			List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
			addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null);
			}

			public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
			if (null != detailList && detailList1) {
			String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
			for (TjOrderDetail detail : detailList) {
			TjSampling sampling = new TjSampling();
			if (null == projectService.getById(detail.getProId())) continue;
			Long proParentId = projectService.getById(detail.getProId()).getProParentId();
			TjProject project = projectService.getById(detail.getProId());
			Long proParentId = project.getProParentId();
			if (null != proParentId && proParentId == 0) {
			sampling.setSpecimenType(projectService.getById(detail.getProId()).getSpecimenType());
			sampling.setJyxh(idUtils.generateLisID());
			LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project);
			if (jyxmzd != null) {
			sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
			LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
			LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
			sampling.setSpecimenType(jybbzd.getJybbmc());
			sampling.setJyxmdm(jyxmzd.getJyxmdm());
			}
			} else {
			sampling.setSpecimenType(projectService.getById(projectService.getById(detail.getProId()).getProParentId()).getSpecimenType());
			TjProject project1 = projectService.getById(proParentId);
			sampling.setJyxh(idUtils.generateLisID());
			LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project1);
			if (jyxmzd != null) {
			sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
			LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
			LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
			sampling.setSpecimenType(jybbzd.getJybbmc());
			sampling.setJyxmdm(jyxmzd.getJyxmdm());
			}
			}
			sampling.setSamplingNumber(format);
			sampling.setTjNum(order.getTjNumber());
			@@ -418,8 +470,37 @@
			sampling.setUpdateTime(new 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);
			}
			}
			}

			}
			}

			@@ -495,13 +576,11 @@
			}

			@Override
			@Async("async")
			@Transactional
			public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
			// @Async("async")
			// @Transactional
			public Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser,String jxbz) {
			Date dates = new Date();
			final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");

			String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();

			tjFlowingWater.setJxbz(jxbz);
			tjFlowingWaterService.updateById(tjFlowingWater);
			@@ -515,27 +594,14 @@
			proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn()));
			blService.save(proBl);

			List<TjConsumables> list2 = new ArrayList<>();
			String[] tjProIds = tjFlowingWater.getTjProIds();

			String config = configService.selectConfigByKey("sfkqdyhis");

			//检验
			List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();

			//检查
			List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();


			//处置
			List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();


			List<TjProject> projectList=new ArrayList<>();

			// ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>();
			for (String tjProId : tjProIds) {
			LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
			wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
			TjProject project = projectService.getById(Long.valueOf(tjProId));
			if (null != project && project.getProParentId() == 0) {
			TjOrderRemark tjOrderRemark = new TjOrderRemark();
			@@ -583,67 +649,14 @@
			detail1.setJxbz(jxbz);
			tjOrderDetailService.save(detail1);
			}
			wqq.in(TbTransition::getProId, proIds);

			if(null !=config && config.equals("Y")){
			//检验
			if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L \|\| project.getDeptId() == 317L)) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailsDtos.add(detailsDto);
			}
			}

			//检查
			if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
			(project.getDeptId() == 247 \|\| project.getDeptId() == 248 \|\| project.getDeptId() == 249 \|\|
			project.getDeptId() == 250 \|\| project.getDeptId() == 251 \|\| project.getDeptId() == 252 \|\|
			project.getDeptId() == 271 \|\| project.getDeptId() == 273 \|\| project.getDeptId() == 274 \|\|
			project.getDeptId() == 275 \|\| project.getDeptId() == 298)) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailsDtoss.add(detailsDto);
			}
			}

			//处置
			if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
			(project.getDeptId() == 100 \|\| project.getDeptId() == 240 \|\| project.getDeptId() == 253 \|\|
			project.getDeptId() == 254 \|\| project.getDeptId() == 255 \|\| project.getDeptId() == 257 \|\|
			project.getDeptId() == 258 \|\| project.getDeptId() == 259 \|\| project.getDeptId() == 269 \|\|
			project.getDeptId() == 270)) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailDtos.add(detailsDto);
			}
			}
			}



			} else {
			wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));

			//如果该项目存在则不保存

			TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
			if(null !=orderDetail) continue;

			TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
			if (null != projects) {
			TjProject projectss = projectService.getById(projects.getProParentId());
			@@ -651,11 +664,9 @@
			projectList.add(projectss);
			}
			}
			// List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
			TjOrderDetail detail = new TjOrderDetail();
			detail.setTjStatus(0L);
			detail.setOrderId(tjFlowingWater.getOrderId());
			// detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
			detail.setProId(Long.valueOf(tjProId));
			detail.setIsAddition("Y");
			detail.setCreateBy(sysUser.getNickName());
			@@ -666,67 +677,25 @@
			detail.setUpdateId(String.valueOf(sysUser.getUserId()));
			detail.setJxbz(jxbz);
			tjOrderDetailService.save(detail);
			// tjOrderDetails.add(detail);

			}

			List<TbTransition> tbTransitionList = transitionService.list(wqq);
			if (null != tbTransitionList && tbTransitionList.size() > 0) {
			List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(),tjProId);
			if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
			for (TbTransition transition : tbTransitionList) {
			transition.setJxbz(jxbz);
			transition.setTjNum(order.getTjNumber());
			transition.setCardId(order.getCardId());
			transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
			transitionService.updateById(transition);
			// TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
			//子项
			// if (null != tjProject) {
			// TjChargingStandard tjChargingStandard = new TjChargingStandard();
			// tjChargingStandard.setTjNum(order.getTjNumber());
			// tjChargingStandard.setProId(transition.getProId());
			// tjChargingStandard.setPrice(transition.getNowPrice());
			// tjChargingStandard.setProName(tjProject.getProName());
			// tjChargingStandard.setCreateBy(sysUser.getNickName());
			// tjChargingStandard.setCreateTime(dates);
			// tjChargingStandard.setUpdateBy(sysUser.getNickName());
			// tjChargingStandard.setUpdateTime(dates);
			// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
			// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
			// chargingStandardService.save(tjChargingStandard);
			// }
			transitionService.updateTbTransitionById(transition.getId().toString(),jxbz,order.getTjNumber(),order.getCardId(),
			transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
			}
			//父项
			//
			// TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
			// if (null != parentProject && parentProject.getProParentId() == 0) {
			// LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
			// wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
			// List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
			// if (null != proConsumables && proConsumables.size() > 0) {
			// for (TjProConsumables tjProConsumables : proConsumables) {
			// TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
			// list2.add(tjConsumables);
			// }
			// }
			//
			// } else {
			// TjProject parentProjects = projectService.getById(tjProId);
			// if (null != parentProjects) {
			// LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
			// wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
			// List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
			// if (null != proConsumables && proConsumables.size() > 0) {
			// for (TjProConsumables tjProConsumables : proConsumables) {
			// TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
			// list2.add(tjConsumables);
			// }
			// }
			// }
			// }
			}

			}
			// TODO 和签到登记一样只有配置中的以及收费类型为体检票时才增加到采样管理表
			// tjOrderDetails = new ArrayList<>();

			if(projectList.size()>0){
			ArrayList<TjProject> jianChaProjects = new ArrayList<>();

			if(!projectList.isEmpty()){
			List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
			for (TjProject project : list) {
			TjOrderRemark tjOrderRemark = new TjOrderRemark();
			@@ -746,7 +715,6 @@
			TjOrderDetail detail1 = new TjOrderDetail();
			detail1.setTjStatus(0L);
			detail1.setOrderId(tjFlowingWater.getOrderId());
			// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
			detail1.setProId(project.getProId());
			detail1.setIsAddition("Y");
			detail1.setCreateBy(sysUser.getNickName());
			@@ -757,272 +725,546 @@
			detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
			detail1.setJxbz(jxbz);
			tjOrderDetailService.save(detail1);
			if(null !=config && config.equals("Y")){
			//检验
			if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L \|\| project.getDeptId() == 317L)) {
			// tjOrderDetails.add(detail1);
			if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();

			detailsDto.setMxfyxmbm(project.getHisXmbm());

			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailsDtos.add(detailsDto);
			jianChaProjects.add(project);
			}
			}
			}

			//检查
			if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
			(project.getDeptId() == 247L \|\| project.getDeptId() == 248L \|\| project.getDeptId() == 249L \|\|
			project.getDeptId() == 250L \|\| project.getDeptId() == 251L \|\| project.getDeptId() == 252L \|\|
			project.getDeptId() == 271L \|\| project.getDeptId() == 273L \|\| project.getDeptId() == 274L \|\|
			project.getDeptId() == 275L \|\| project.getDeptId() == 298L)) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailsDtoss.add(detailsDto);
			}
			}

			//处置
			if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 &&
			(project.getDeptId() == 100L \|\| project.getDeptId() == 240L \|\| project.getDeptId() == 253L \|\|
			project.getDeptId() == 254L \|\| project.getDeptId() == 255L \|\| project.getDeptId() == 257L \|\|
			project.getDeptId() == 258L \|\| project.getDeptId() == 259L \|\| project.getDeptId() == 269L \|\|
			project.getDeptId() == 270L)) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailDtos.add(detailsDto);
			}
			}
			// TODO 和签到登记一样只有配置中的以及收费类型为体检票时才增加到采样管理表
			if(config.equalsIgnoreCase("Y")){
			if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
			List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
			addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
			}
			}else {
			// tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString());
			// orderRemarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),jxbz,tjFlowingWater.getTjSerialNumber().toString());

			List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
			addCaiYangDengJiByDiaoYongShiTu(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
			}
			}

			if(null !=config && config.equals("Y")){
			AjaxResult result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
			if (!result.get("code").toString().equals("200"))
			return false;
			}
			return true;
			}

			public void addCaiYangDengJiByDiaoYongShiTu(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);
			}
			}
			}

			}
			}


			//检验申请
			if(detailsDtos.size()>0){

			//体检对his申请单调用方法
			public AjaxResult tijianbulushenqing(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
			TjOrder order = orderService.getOrderByCardId(cardId);
			if(null !=order){
			String dept = configService.selectConfigByKey("request_default_dept");
			String ysbm = configService.selectConfigByKey("request_default_ysbm");
			String ysmc = configService.selectConfigByKey("request_default_ysmc");
			List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
			Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
			List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
			if (useLisAndPacsRegister && isTuanTiPiao) {
			// 检查申请
			pacsReg(order, customer, jianChaProjects);
			LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(TjSampling::getTjNum,order.getTjNumber());
			wrapper.eq(TjSampling::getJxbz,jxbz);
			List<TjSampling> list = tjSamplingService.list(wrapper);
			log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
			if (!list.isEmpty()){
			Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
			log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
			ArrayList<String> ids = new ArrayList<>();
			for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
			log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
			// Lis标本代码
			String specimenTypeCode = entry.getKey();
			List<TjSampling> samplings = entry.getValue();
			if (samplings.size() >= 2){
			// 进行合并
			List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
			log.info("提取id ->{}",stringList);
			for (int i = 0; i < stringList.size(); i++) {
			String s = stringList.get(i);
			if (tjSamplingService.isMergeItem(s) != 0) {
			stringList.remove(s);
			ids.add(s);
			}
			}
			if (stringList.size() > 1) {
			String id = tjSamplingService.mergeCaiYangApi(stringList);
			ids.add(id);
			}else {
			ids.add(stringList.get(0));
			}
			}else {
			ids.add(samplings.get(0).getId());
			}
			}
			Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N");
			if (!confirmed)
			return AjaxResult.error("处理失败");
			}
			}else {
			//检验申请
			OutpintestapplyDto dto = new OutpintestapplyDto();
			dto.setHisRegistrationId(order.getCardId());
			dto.setHisRegistrationId(cardId);
			dto.setSfzh(customer.getCusIdcard());
			dto.setSqysbm("00029");
			dto.setMzksbm("0101");
			dto.setSqysbm(ysbm);
			dto.setMzksbm(dept);
			dto.setSjrq(date);
			dto.setCzybm("00029");
			dto.setCzyksbm("0101");
			dto.setCzybm(ysbm);
			dto.setCzyksbm(dept);
			dto.setSfjz("0");
			dto.setDetails(detailsDtos.stream().distinct().collect(Collectors.toList()));
			AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
			String result5 = getAjaxResult(ajaxResult1);
			JSONObject object3 = getJSONObject(result5);
			String code3 = object3.getStr("ResultCode");
			if (code3.equals("0")) {
			List<OutpintestapplyDetailsDto> details = dto.getDetails();
			for (OutpintestapplyDetailsDto detail : details) {
			LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
			tree.setSfjx("Y");
			tree.setJxbz(jxbz);
			tree.setCardId(dto.getHisRegistrationId());
			LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
			wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
			TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
			tree.setPationid(tjCustomer.getPationId());
			JSONObject resultData = object3.getJSONObject("ResultData");
			tree.setSqdh(resultData.getStr("jysqdh"));
			tree.setFyhj(resultData.getStr("fyhj"));
			String mxfyxmbm = detail.getMxfyxmbm();
			tree.setHisXmdm(mxfyxmbm);
			tree.setType("检验");
			LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
			List<TjProject> list = projectService.list(wrapper);
			String tj_price = "";
			for (TjProject project : list) {
			tj_price += project.getProPrice() + "、";

			List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
			if (null != detailList && !detailList.isEmpty()) {
			LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
			wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
			// wq.groupBy(TjProject::getHisXmbm);
			// wq.in(TjProject::getDeptId, "241", "317");
			wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
			List<TjProject> projects = projectService.list(wq);
			if (null != projects && !projects.isEmpty()) {
			for (TjProject project : projects) {
			if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailsDto.setProjg(project.getProPrice());
			detailsDtos.add(detailsDto);
			}
			if(project.getProId()==1740177341251154377L){
			OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
			detilsDto.setYpbm("00006670");
			detilsDto.setPcbm("06");
			detilsDto.setSl("1");
			detilsDto.setDj("60");
			detilsDto.setDcjl("1");
			detilsDto.setPj("60");
			detilsDto.setJj("60");
			detilsDto.setJldw("");
			detilsDto.setTjbm("");
			detilsDto.setPs("");
			detilsDto.setPsbm("");
			detilsDto.setYyts("");
			detilsDto.setXtph("");
			detilsDto.setScph("");
			detilsDto.setYpxq("");
			detilsDto.setCdbm("");
			detilsDto.setKfdw("");
			detilsDto.setYfdw("");
			detilsDto.setYysm("");
			detilsDto.setFzbl("1");
			detilsDto.setZh("0");
			outpinmedicapplyDetilsDtos.add(detilsDto);
			}
			}
			}
			tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
			LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
			if (detail.getSfzhfy().equals("1"))
			wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
			else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
			List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
			if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
			String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
			LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
			wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
			LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
			LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
			wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
			LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
			tree.setXmfl(ejjfxmzd.getYjkmdm());
			}
			ltkjJianchajianyanTreeService.save(tree);
			}

			}
			}
			if (!detailsDtos.isEmpty()) {
			dto.setDetails(detailsDtos);
			AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
			String result5 = getAjaxResult(ajaxResult1);
			JSONObject object3 = getJSONObject(result5);
			String code3 = object3.getStr("ResultCode");
			if (code3.equals("0")) {
			List<OutpintestapplyDetailsDto> details = dto.getDetails();
			for (OutpintestapplyDetailsDto detail : details) {
			LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
			tree.setJxbz(jxbz);
			tree.setCardId(dto.getHisRegistrationId());
			tree.setPationid(customer.getPationId());
			JSONObject resultData = object3.getJSONObject("ResultData");
			tree.setSqdh(resultData.getStr("jysqdh"));
			tree.setFyhj(resultData.getStr("fyhj"));
			String mxfyxmbm = detail.getMxfyxmbm();
			tree.setHisXmdm(mxfyxmbm);
			tree.setType("检验");
			tree.setService("his");
			tree.setTjPrice(String.valueOf(detail.getProjg()));
			LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
			if (detail.getSfzhfy().equals("1"))
			wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
			else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
			List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
			if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
			String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
			LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
			wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
			LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
			LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
			wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
			LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
			tree.setXmfl(ejjfxmzd.getYjkmdm());
			}
			tree.setCreateTime(DateUtil.date());
			ltkjJianchajianyanTreeService.save(tree);
			}
			}
			}

			//门诊检查申请
			if(detailsDtoss.size()>0){
			//门诊检查申请
			OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
			outpinexamapplyDto.setHisRegistrationId(order.getCardId());
			outpinexamapplyDto.setHisRegistrationId(cardId);
			outpinexamapplyDto.setSfzh(customer.getCusIdcard());
			outpinexamapplyDto.setSqysbm("00029");
			outpinexamapplyDto.setMzksbm("0101");
			outpinexamapplyDto.setCzybm("00029");
			outpinexamapplyDto.setCzyksbm("0101");
			outpinexamapplyDto.setSqysbm(ysbm);
			outpinexamapplyDto.setMzksbm(dept);
			outpinexamapplyDto.setCzybm(ysbm);
			outpinexamapplyDto.setCzyksbm(dept);
			outpinexamapplyDto.setSfjz("0");
			outpinexamapplyDto.setDetails(detailsDtoss.stream().distinct().collect(Collectors.toList()));
			AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
			String result6 = getAjaxResult(ajaxResult2);
			JSONObject object5 = getJSONObject(result6);
			String code4 = object5.getStr("ResultCode");
			if (code4.equals("0")) {
			List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
			for (OutpintestapplyDetailsDto detail : details) {
			LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
			tree.setSfjx("Y");
			tree.setJxbz(jxbz);
			tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
			LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
			wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
			TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
			tree.setPationid(tjCustomer.getPationId());
			JSONObject resultData = object5.getJSONObject("ResultData");
			tree.setSqdh(resultData.getStr("jcsqdh"));
			tree.setFyhj(resultData.getStr("fyhj"));
			String mxfyxmbm = detail.getMxfyxmbm();
			tree.setHisXmdm(mxfyxmbm);
			tree.setType("检查");
			LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
			List<TjProject> list = projectService.list(wrapper);
			String tj_price = "";
			for (TjProject project : list) {
			tj_price += project.getProPrice() + "、";
			// List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
			List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
			if (null != detailList && !detailList.isEmpty()) {
			LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
			wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
			wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
			List<TjProject> projects = projectService.list(wq);
			if (null != projects && !projects.isEmpty()) {
			for (TjProject project : projects) {
			if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailsDto.setProjg(project.getProPrice());
			detailsDtoss.add(detailsDto);
			}
			if(project.getProId()==1740177341251154377L){
			OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
			detilsDto.setYpbm("00006670");
			detilsDto.setPcbm("06");
			detilsDto.setSl("1");
			detilsDto.setDj("60");
			detilsDto.setDcjl("1");
			detilsDto.setPj("60");
			detilsDto.setJj("60");
			detilsDto.setJldw("");
			detilsDto.setTjbm("");
			detilsDto.setPs("");
			detilsDto.setPsbm("");
			detilsDto.setYyts("");
			detilsDto.setXtph("");
			detilsDto.setScph("");
			detilsDto.setYpxq("");
			detilsDto.setCdbm("");
			detilsDto.setKfdw("");
			detilsDto.setYfdw("");
			detilsDto.setYysm("");
			detilsDto.setFzbl("1");
			detilsDto.setZh("0");
			outpinmedicapplyDetilsDtos.add(detilsDto);
			}
			}
			}
			tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
			LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
			if (detail.getSfzhfy().equals("1"))
			wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
			else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
			List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
			if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
			String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
			LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
			wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
			LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
			LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
			wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
			LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
			tree.setXmfl(ejjfxmzd.getYjkmdm());
			}
			ltkjJianchajianyanTreeService.save(tree);
			}
			}
			}
			if (!detailsDtoss.isEmpty()) {
			outpinexamapplyDto.setDetails(detailsDtoss);
			AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
			String result6 = getAjaxResult(ajaxResult2);
			JSONObject object5 = getJSONObject(result6);
			String code4 = object5.getStr("ResultCode");
			if (code4.equals("0")) {
			List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
			for (OutpintestapplyDetailsDto detail : details) {
			LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
			tree.setJxbz(jxbz);
			tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
			tree.setPationid(customer.getPationId());
			JSONObject resultData = object5.getJSONObject("ResultData");
			tree.setSqdh(resultData.getStr("jcsqdh"));
			tree.setFyhj(resultData.getStr("fyhj"));
			String mxfyxmbm = detail.getMxfyxmbm();
			tree.setHisXmdm(mxfyxmbm);
			tree.setType("检查");
			tree.setService("his");
			tree.setTjPrice(String.valueOf(detail.getProjg()));
			LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
			if (detail.getSfzhfy().equals("1"))
			wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
			else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
			List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
			if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
			String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
			LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
			wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
			LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
			LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
			wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
			LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
			tree.setXmfl(ejjfxmzd.getYjkmdm());
			}
			tree.setCreateTime(DateUtil.date());
			ltkjJianchajianyanTreeService.save(tree);
			}
			}
			}


			//门诊治疗处置申请
			if(detailDtos.size()>0){
			//门诊治疗处置申请
			OutpintreatapplyDto dao = new OutpintreatapplyDto();
			dao.setHisRegistrationId(order.getCardId());
			dao.setHisRegistrationId(cardId);
			dao.setSfzh(customer.getCusIdcard());
			dao.setSqysbm("00029");
			dao.setMzksbm("0101");
			dao.setSqysbm(ysbm);
			dao.setMzksbm(dept);
			dao.setSjrq(date);
			dao.setCzybm("00029");
			dao.setCzyksbm("0101");
			dao.setCzybm(ysbm);
			dao.setCzyksbm(dept);
			dao.setSfjz("0");
			dao.setDetails(detailDtos.stream().distinct().collect(Collectors.toList()));
			AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
			String mzylyzsq2 = getAjaxResult(mzylyzsq1);
			JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
			String code5 = mzylyzsq3.getStr("ResultCode");
			if (code5.equals("0")) {
			List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
			for (OutpintestapplyDetailsDto detail : details1) {
			LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
			tree.setSfjx("Y");
			tree.setJxbz(jxbz);
			tree.setCardId(dao.getHisRegistrationId());
			LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
			wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
			TjCustomer tjCustomer = tjCustomerService.getOne(wrapper4);
			tree.setPationid(tjCustomer.getPationId());
			JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
			tree.setSqdh(resultData.getStr("zlczh"));
			tree.setFyhj(resultData.getStr("fyhj"));
			String mxfyxmbm = detail.getMxfyxmbm();
			tree.setHisXmdm(mxfyxmbm);
			tree.setType("处置");
			LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
			List<TjProject> list = projectService.list(wrapper);
			String tj_price = "";
			for (TjProject project : list) {
			tj_price += project.getProPrice() + "、";
			// List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
			List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
			if (null != detailList && !detailList.isEmpty()) {
			LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
			wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
			wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
			List<TjProject> projects = projectService.list(wq);
			if (null != projects && !projects.isEmpty()) {
			for (TjProject project : projects) {
			if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
			if (null != project.getHisXmbm()) {
			OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
			detailsDto.setMxfyxmbm(project.getHisXmbm());
			if (project.getSfzhfy().equals("Y")) {
			detailsDto.setSfzhfy("1");
			} else {
			detailsDto.setSfzhfy("0");
			}
			detailsDto.setSl(project.getSl());
			detailsDto.setProjg(project.getProPrice());
			detailDtos.add(detailsDto);
			}
			if(project.getProId()==1740177341251154377L){
			OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
			detilsDto.setYpbm("00006670");
			detilsDto.setPcbm("06");
			detilsDto.setSl("1");
			detilsDto.setDj("60");
			detilsDto.setDcjl("1");
			detilsDto.setPj("60");
			detilsDto.setJj("60");
			detilsDto.setJldw("");
			detilsDto.setTjbm("");
			detilsDto.setPs("");
			detilsDto.setPsbm("");
			detilsDto.setYyts("");
			detilsDto.setXtph("");
			detilsDto.setScph("");
			detilsDto.setYpxq("");
			detilsDto.setCdbm("");
			detilsDto.setKfdw("");
			detilsDto.setYfdw("");
			detilsDto.setYysm("");
			detilsDto.setFzbl("1");
			detilsDto.setZh("0");
			outpinmedicapplyDetilsDtos.add(detilsDto);
			}
			}
			}
			tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
			LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
			if (detail.getSfzhfy().equals("1"))
			wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
			else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
			List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
			if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
			String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
			LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
			wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
			LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
			LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
			wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
			LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
			tree.setXmfl(ejjfxmzd.getYjkmdm());
			}
			}
			if (!detailDtos.isEmpty()) {
			dao.setDetails(detailDtos);
			AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
			String mzylyzsq2 = getAjaxResult(mzylyzsq1);
			JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
			String code5 = mzylyzsq3.getStr("ResultCode");
			if (code5.equals("0")) {
			List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
			for (OutpintestapplyDetailsDto detail : details1) {
			LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
			tree.setJxbz(jxbz);
			tree.setCardId(dao.getHisRegistrationId());
			tree.setPationid(customer.getPationId());
			JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
			tree.setSqdh(resultData.getStr("zlczh"));
			tree.setFyhj(resultData.getStr("fyhj"));
			String mxfyxmbm = detail.getMxfyxmbm();
			tree.setHisXmdm(mxfyxmbm);
			tree.setType("处置");
			tree.setTjPrice(String.valueOf(detail.getProjg()));
			LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
			if (detail.getSfzhfy().equals("1"))
			wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
			else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
			List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
			if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
			String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
			LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
			wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
			LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
			LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
			wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
			LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
			tree.setXmfl(ejjfxmzd.getYjkmdm());
			}
			tree.setCreateTime(DateUtil.date());
			ltkjJianchajianyanTreeService.save(tree);
			}
			ltkjJianchajianyanTreeService.save(tree);
			}
			}

			//药品申请
			if(!outpinmedicapplyDetilsDtos.isEmpty()){
			OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
			dto1.setHisRegistrationId(cardId);
			dto1.setSfzh(customer.getCusIdcard());
			dto1.setSqysbm(ysbm);
			dto1.setMzksbm(dept);
			dto1.setSjrq(date);
			dto1.setCzybm(ysbm);
			dto1.setCzyksbm(dept);
			dto1.setCflxbm("A");
			dto1.setYfbm("1");
			dto1.setFyts("1");
			dto1.setMzzd("");
			dto1.setDetails(outpinmedicapplyDetilsDtos);
			AjaxResult result = controller.Outpinmedicapply(dto1);
			String result1 = getAjaxResult(result);
			JSONObject object = getJSONObject(result1);
			String code = object.getStr("ResultCode");
			if(null !=code && code.equals("0")){
			JSONObject resultData = object.getJSONObject("ResultData");
			// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
			String cfh = resultData.getStr("cfh");
			log.info("药品申请后的处方号是: "+cfh+" outpinmedicapplyDetilsDtos 里面的值为: "+outpinmedicapplyDetilsDtos.toString());
			for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
			TjCf cf=new TjCf();
			cf.setJxbz(jxbz);
			cf.setCardId(cardId);
			cf.setSfzh(customer.getCusIdcard());
			cf.setCfh(cfh);
			cf.setSqysbm(ysbm);
			cf.setSqysxm(ysmc);
			cf.setMzksbn(dept);
			cf.setSqrq(date);
			cf.setCzybm(ysbm);
			cf.setYpbm(detilsDto.getYpbm());
			cf.setYpmc("尿素[14C]呼气试验药盒");
			cf.setSl(String.valueOf(detilsDto.getSl()));
			cf.setDj(String.valueOf(detilsDto.getDj()));
			cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
			cf.setPj(String.valueOf(detilsDto.getPj()));
			cf.setJj(String.valueOf(detilsDto.getJj()));
			cf.setCreateTime(new Date());
			cfService.save(cf);
			}
			}
			}
			}
			}
			return AjaxResult.success();
			}


			//父项耗材
			// ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
			// for (TjConsumables tjConsumables : collect) {
			// TjChargingStandard tjChargingStandard = new TjChargingStandard();
			// tjChargingStandard.setTjNum(order.getTjNumber());
			// tjChargingStandard.setConsumablesId(tjConsumables.getId());
			// tjChargingStandard.setPrice(tjConsumables.getPrice());
			// tjChargingStandard.setProName(tjConsumables.getMakings());
			// tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
			// tjChargingStandard.setCompany(tjConsumables.getSpecifications());
			// tjChargingStandard.setCreateBy(sysUser.getNickName());
			// tjChargingStandard.setCreateTime(dates);
			// tjChargingStandard.setUpdateBy(sysUser.getNickName());
			// tjChargingStandard.setUpdateTime(dates);
			// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
			// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
			// chargingStandardService.save(tjChargingStandard);
			// }
			public void pacsReg(TjOrder order, TjCustomer customer, ArrayList<TjProject> jianChaProjects) {
			List<TjProject> projectList1 = jianChaProjects.stream().distinct().collect(Collectors.toList());
			JSONArray array = JSONUtil.createArray();
			ArrayList<SavePacsApply> successPacsList = new ArrayList<>();
			ArrayList<SavePacsApply> errorPacsList = new ArrayList<>();
			int allTotal = 0;
			try {
			allTotal = pacsApiMethodService.saveProjects(order, customer, projectList1, array, successPacsList, errorPacsList);
			} catch (Exception e) {
			log.error(e.getMessage());
			for (Object object : array) {
			JSONObject jsonObject = (JSONObject) object;
			pacsApiMethodService.updatePacsApply(jsonObject.getStr("regNo"), jsonObject.getStr("cardId"), jsonObject.getStr("name"));
			}
			}
			log.info("检查总计 ->{}个", allTotal);
			if (!errorPacsList.isEmpty()) {
			log.info("成功 ->{}", successPacsList);
			log.error("失败 ->{}", errorPacsList);
			}
			}

			@Override
			@@ -1520,52 +1762,23 @@
			chargingStandardService.save(tjChargingStandard);
			}

			LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
			wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
			wq.isNotNull(TjOrderDetail::getFlowingWaterId);
			wq.eq(TjOrderDetail::getIsSampling, 0);
			List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
			if (null != detailList && detailList.size() > 0) {
			String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
			for (TjOrderDetail detail : detailList) {
			TjSampling sampling = new TjSampling();
			if (null == projectService.getById(detail.getProId())) continue;
			Long proParentId = projectService.getById(detail.getProId()).getProParentId();
			if (null != proParentId && proParentId == 0) {
			sampling.setSpecimenType(projectService.getById(detail.getProId()).getSpecimenType());
			} else {
			sampling.setSpecimenType(projectService.getById(projectService.getById(detail.getProId()).getProParentId()).getSpecimenType());
			}
			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(new Date());
			sampling.setTjTime(order.getCreateTime());
			sampling.setProId(String.valueOf(detail.getProId()));
			sampling.setProName(projectService.getById(detail.getProId()).getProName());
			sampling.setCreateBy(sysUser.getNickName());
			sampling.setCreateTime(new Date());
			sampling.setUpdateBy(sysUser.getNickName());
			sampling.setUpdateTime(new Date());
			sampling.setCreateId(String.valueOf(sysUser.getUserId()));
			sampling.setUpdateId(String.valueOf(sysUser.getUserId()));
			samplingService.save(sampling);
			}
			}
			List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
			addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser,null);
			}



			//首页饼状图登记人数接口
			private AjaxResult getPieCharts() {
			Map<String, Object> map = new HashMap<>();

			Date date=new Date();

			//获取体检登记数
			LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
			wq0.between(TjOrder::getCreateTime, DateUtil.lastMonth(), DateUtil.now());
			wq0.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
			List<TjOrder> orderCountList = orderService.list(wq0);
			if (null != orderCountList && orderCountList.size() > 0) {
			if (null != orderCountList && !orderCountList.isEmpty()) {
			List<PieChartVo> pieChartVoList = getTjorderCountMap(orderCountList);
			map.put("tjdj", pieChartVoList);
			} else {
			@@ -1573,11 +1786,13 @@
			}
			//获取体检异常数
			LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
			wq1.between(TjOrder::getFinishTime, DateUtil.lastMonth(), DateUtil.now());
			wq1.eq(TjOrder::getCheckStatus, 1);
			List<TjOrder> orderAbnormalCountList = orderService.list(wq1);
			if (null != orderAbnormalCountList && orderAbnormalCountList.size() > 0) {
			List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderAbnormalCountList);
			wq1.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
			// wq1.isNotNull(TjOrder::getFinishTime);
			// wq1.eq(TjOrder::getCheckStatus, 1);
			List<TjOrder> orderList = orderService.list(wq1);
			if (null !=orderList && !orderList.isEmpty()) {
			// List<TjOrder> orderList = orderAbnormalCountList.stream().distinct().collect(Collectors.toList());
			List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderList);
			map.put("tjyc", pieChartVoList);
			} else {
			map.put("tjyc", 0);
			@@ -1644,14 +1859,14 @@
			int c = 0;
			int d = 0;
			int e = 0;
			Map<String, Object> map = null;
			Map<String, Object> map = new HashMap<>();
			for (TjOrder tjOrder : orderList) {
			map = new HashMap<>();
			LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
			wq.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
			wq.eq(TjOrderDetail::getExceptionDesc, 1);
			List<TjOrderDetail> list = tjOrderDetailService.list(wq);
			if (null != list && list.size() > 0) {
			int count = hysqdService.getHyYcXmCount(tjOrder.getCardId());
			if ((null != list && !list.isEmpty()) \|\| (count>0)) {
			TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
			if (null != customer) {
			int age = DateUtil.ageOfNow(customer.getCusBrithday());
			@@ -1667,15 +1882,14 @@
			e += 1;
			}
			}
			map.put("0-3岁", a);
			map.put("3-16岁", b);
			map.put("16-40岁", c);
			map.put("40-60岁", d);
			map.put("60岁以上", e);
			}
			}
			map.put("0-3岁", a);
			map.put("3-16岁", b);
			map.put("16-40岁", c);
			map.put("40-60岁", d);
			map.put("60岁以上", e);
			List<PieChartVo> pieChartVoList = new ArrayList<>();
			assert map != null;
			for (Map.Entry<String, Object> entry : map.entrySet()) {
			PieChartVo pieChartVo = new PieChartVo();
			pieChartVo.setName(entry.getKey());
			@@ -2530,4 +2744,9 @@
			map.put("remark", remark.getRemark());
			return map;
			}

			@Override
			public void tjUpdateDetatilByVi(String s) {

			}
			}