| | |
| | | if (vValues.size() > 0) { |
| | | //不合格 |
| | | if (vValues.get(1) != 0) { |
| | | productCount2 = productCount2 - 1 + vValues.get(1); |
| | | productCount2 = productCount2 + vValues.get(1); |
| | | } |
| | | //合格 |
| | | if (vValues.get(0) != 0) { |
| | | if (fusheProduct.getInsResult() == 1) { |
| | | productCount3 = productCount3 - 1 + vValues.get(0); |
| | | } else productCount3 = productCount3 + vValues.get(0); |
| | | productCount3 = productCount3 + vValues.get(0); |
| | | } |
| | | } |
| | | // 判定是否减掉辐射检验项本身 |
| | | if (fusheProduct.getInsResult() == 1) { |
| | | productCount3 = productCount3 - 1; |
| | | }else if(fusheProduct.getInsResult() == 0){ |
| | | productCount2 = productCount2 - 1; |
| | | } |
| | | //总数=项目总数-辐射项目数量+辐射具体的(合格+不合格)数量 |
| | | productCount = productCount - 1 + vValues.stream().mapToLong(Long::longValue).sum(); |
| | |
| | | if (i % 2 == 0) { |
| | | urlListDto = new UrlListDto(); |
| | | urlListDto.setImageOne(Pictures.ofLocal(imgUrl + "/" + insOrderFiles.get(i).getFileUrl()).create()); |
| | | if (i == insOrderFiles.size() - 1) { |
| | | urlList.add(urlListDto); |
| | | } |
| | | } else { |
| | | urlListDto.setImageTwo(Pictures.ofLocal(imgUrl + "/" + insOrderFiles.get(i).getFileUrl()).create()); |
| | | urlList.add(urlListDto); |
| | | } |
| | | if (i == insOrderFiles.size() - 1) { |
| | | urlList.add(urlListDto); |
| | | } |
| | | |
| | | } |
| | | } |
| | | //样品编号参照上述sampleCode |