ltkj_peis_region.git

			@@ -1391,7 +1391,7 @@
			}

			private AjaxResult getResult(String tjNumber) {
			asyncService.updateCheckType(tjNumber);
			// asyncService.updateCheckType(tjNumber);
			List<Map<String, Object>> list = new ArrayList<>();
			TjOrder one = orderService.getOrderByTjNum(tjNumber);

			@@ -1422,7 +1422,6 @@
			Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream()
			.filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId()))
			.collect(Collectors.groupingBy(TjOrderDetail::getProResult));
			// null !=dictList &&

			boolean isGroupOnce = false;
			String groupOnceProResult = "";
			@@ -1445,13 +1444,15 @@
			}else{
			for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
			if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
			String ckfw = tjOrderDetail.getStanId();
			/* String ckfw = tjOrderDetail.getStanId();
			if (null != ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
			ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
			}
			if (StrUtil.isNotBlank(ckfw)) {
			try {
			if (ckfw != null && ckfw.contains("-")) {
			String ycbz = tjOrderDetail.getYcbz();
			if(StringUtil.isBlank(ycbz)){
			Integer.parseInt(tjOrderDetail.getYcbz());
			String[] split = ckfw.split("-");
			BigDecimal min = new BigDecimal(split[0]);
			@@ -1475,6 +1476,9 @@
			tjOrderDetail.setYcbz("");
			}
			} else {
			tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
			}
			} else {
			if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
			tjOrderDetail.setYcbz("");

			@@ -1490,8 +1494,12 @@
			if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
			tjOrderDetail.setYcbz("↑");
			tjOrderDetail.setProResult(tjOrderDetail.getProResult());
			}
			}*/

			String ycbz = tjOrderDetail.getYcbz();
			if(StringUtil.isNotBlank(ycbz)){
			tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
			}
			if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
			dels.add(tjOrderDetail);
			}
			@@ -1639,11 +1647,12 @@
			private static AjaxResult getOrderYcxmList(List<TjOrderYcxm> list) {
			try {
			List<Map<String, Object>> maps = getYcxmMapList(list);
			if (!maps.isEmpty()) {
			if (null != maps && !maps.isEmpty()) {
			List<Map<String, Object>> collect1 = maps.stream()
			.sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
			.collect(Collectors.toList());
			return AjaxResult.success(collect1);
			// return AjaxResult.success(maps);
			}
			return AjaxResult.success(maps);
			} catch (Exception ex) {
			@@ -1695,6 +1704,7 @@
			return null;
			}
			}


			private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
			List<Map<String, Object>> list = new ArrayList<>();
			@@ -1801,8 +1811,14 @@
			if (null != order) {
			String xb = customerService.getSexByTjh(order.getTjNumber());
			List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);


			List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
			if (null != remarkList && !remarkList.isEmpty()) {
			List<TjOrderRemark> collects = remarkList.stream()
			.filter(b -> tjOrderYcxmList.stream()
			.noneMatch(a -> a.getParentName() != null && a.getParentName().equals(b.getProName()))).collect(Collectors.toList());
			if (!collects.isEmpty()) {
			for (TjOrderRemark remark : remarkList) {
			Map<String, Object> parent = new HashMap<>();
			if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
			@@ -1850,14 +1866,12 @@
			}
			}
			}
			}
			}

			List<Map<String, Object>> maps = getYcxmMapList(tjOrderYcxmList);
			List<Map<String, Object>> collect = list.stream()
			.filter(b -> maps.stream()
			.noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 过滤掉在 maps 中存在的相同元素
			.collect(Collectors.toList());

			if (!collect.isEmpty()) {
			for (Map<String, Object> map : collect) {
			for (TjOrderDetail detail : (List<TjOrderDetail>) map.get("sone")) {
			@@ -1876,6 +1890,10 @@
			}
			}

			}
			}
			}

			} catch (Exception ex) {
			log.error(ex.getMessage());
			}