tx-lims-after.git

			@@ -253,14 +253,6 @@
			ProcessReport processReport = new ProcessReport();
			processReport.setInsReportCode(insReport.getCode());
			processReportMapper.insert(processReport);
			/检验单结束/
			List<InsReport> insReports = insReportMapper.selectList(Wrappers.<InsReport>lambdaQuery().eq(InsReport::getInsOrderId, insReport.getInsOrderId()));
			List<Integer> list = insReports.stream().map(InsReport::getIsRatify).distinct().collect(Collectors.toList());
			if (list.size()==1 && list.contains(1)){
			InsOrder insOrder = insOrderMapper.selectById(insReport.getInsOrderId());
			insOrder.setState(4);
			insOrderMapper.updateById(insOrder);
			}
			return 0;
			}

			@@ -377,7 +369,7 @@
			if (insReportDto.getState() == 1) {
			List<InsReportDto1> insReportDto1s = insReportDto.getInsReportDto1s();
			for (InsReportDto1 insReportDto1 : insReportDto1s) {
			if (ObjectUtils.isNotEmpty(insReportDto1.getInsReportDto2s())){
			if (ObjectUtils.isNotEmpty(insReportDto1.getInsReportDto2s())) {
			wordUtils.generateReport(insReportDto.getId(), insReportDto1);
			}
			}
			@@ -390,16 +382,15 @@

			//查出该订单下每个站点下的检验次数
			@Override
			public List<InsOrderStateDto> getInsOrderStateCount(Integer id) {
			public List<InsOrderStateDto> getInsOrderStateCount(Integer id, Integer sampleId) {
			List<InsOrderStateDto> insOrderStateDtos = new ArrayList<>();
			List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, id));
			for (InsSample insSample : insSamples) {
			InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
			insOrderStateDto.setInsSample(insSample);
			List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
			insOrderStateDto.setInsOrderStates(insOrderStates);
			insOrderStateDtos.add(insOrderStateDto);
			}
			InsSample insSample = insSampleMapper.selectById(sampleId);
			InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
			insOrderStateDto.setInsSample(insSample);
			List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
			insOrderStateDto.setInsOrderStates(insOrderStates);
			insOrderStateDtos.add(insOrderStateDto);

			return insOrderStateDtos;
			}