|
|
|
@ -473,7 +473,7 @@ public class SubController {
|
|
|
|
|
|
|
|
|
|
GCalGrp GCG = new GCalGrp();
|
|
|
|
|
GCG.setLtInfoGPreOrder(new ArrayList<>());
|
|
|
|
|
e.getLtInfoGPreOrder().forEach(f -> {
|
|
|
|
|
e.getLtInfoGPreOrder().parallelStream().forEach(f -> {
|
|
|
|
|
|
|
|
|
|
//化学成分 chemical composition
|
|
|
|
|
if (!ChkChemical(SInfo, f)) {
|
|
|
|
@ -574,8 +574,16 @@ public class SubController {
|
|
|
|
|
//订单要求化学成分
|
|
|
|
|
// logger.info("化学成分订单号:" + GrpOrd.getOrderNo());
|
|
|
|
|
List<QdToLineupResultCheDO> ltLrc = new ArrayList<>();
|
|
|
|
|
// int i =plistQdToLineupResultCheDO.stream().filter(p->p.getCheType().equals(null)).collect(Collectors.toList()).size();
|
|
|
|
|
// logger.info("化学成分订单号:{}-{}" , GrpOrd.getOrderNo(),i);
|
|
|
|
|
int intOrd =plistQdToLineupResultCheDO.stream().filter(p->p.getOrderNo().equals(null)).collect(Collectors.toList()).size();
|
|
|
|
|
int intRX =plistQdToLineupResultCheDO.stream().filter(p->p.getCheType().equals(null)).collect(Collectors.toList()).size();
|
|
|
|
|
if (intOrd>0 || intRX>0)
|
|
|
|
|
{
|
|
|
|
|
logger.info("*************************化学成分订单号:{}-{}-{}" , GrpOrd.getOrderNo(),intOrd,intRX);
|
|
|
|
|
}
|
|
|
|
|
if (plistQdToLineupResultCheDO==null)
|
|
|
|
|
{
|
|
|
|
|
logger.info("*************************化学成分订单号:{}-{}-{}" , GrpOrd.getOrderNo(),intOrd,intRX);
|
|
|
|
|
}
|
|
|
|
|
if (plistQdToLineupResultCheDO.stream().anyMatch(p -> p.getOrderNo().equals(GrpOrd.getOrderNo()) && p.getCheType().equals("RX"))) {
|
|
|
|
|
ltLrc = plistQdToLineupResultCheDO.stream().filter(p -> p.getOrderNo().equals(SInfo.getOrderNo()) && p.getCheType().equals("RX")).collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|