tx-lims-after.git

			@@ -245,7 +245,7 @@
			}).thenAccept(res -> {
			if(res!=null){
			int pId = Integer.parseInt(res.replaceAll("\\D+", ""));
			// TODO: 2024/5/4 需要通过pid获取检验单当前试验室所有项目是否有检验结果后进行判断检验单是否更改成“已检”状态
			// TODO: 2024/5/4 【前置】需要通过pid获取检验单当前试验室所有项目是否有检验结果后进行判断检验单是否更改成“已检”状态；前置完成后可能会导致复核接口判断是否产生报告的逻辑错误
			// InsProduct insProduct = insProductMapper.selectById(pId);
			// insSampleMapper.selectList(Wrappers.<>)
			}
			@@ -272,6 +272,7 @@
			insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, now).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell).set(InsOrderState::getVerifyUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
			List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, orderId));
			long count = insOrderStates.stream().filter(a -> a.getInsState() == 5).count();
			// TODO: 2024/5/5 【后置】报告是否生成的判断可能会因为前置操作导致永远判断不通过
			if (count == insOrderStates.size() && num == 5) {
			InsOrder insOrder = insOrderMapper.selectById(orderId);
			Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
			@@ -387,6 +388,7 @@
			if ("参数".equals(v.get("v"))) delSet.add(jo1.get("c") + "");
			}
			}
			// TODO: 2024/5/5 下列循环缺少word合并单元格的操作
			for (int i = 0; i < temp.size(); i++) {
			JSONObject jo1 = temp.get(i);
			TextRenderData textRenderData = new TextRenderData();

			@@ -8,7 +8,6 @@
			import com.yuanchu.mom.mapper.StandardTreeMapper;
			import com.yuanchu.mom.pojo.InsSample;
			import com.yuanchu.mom.pojo.StandardProductList;
			import com.yuanchu.mom.pojo.StandardTree;
			import com.yuanchu.mom.service.StandardProductListService;
			import lombok.AllArgsConstructor;
			import org.springframework.stereotype.Service;
			@@ -149,13 +148,13 @@
			e.printStackTrace();
			return null;
			});
			switch (trees.length){
			/*switch (trees.length){
			case 3:
			standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
			break;
			case 4:
			break;
			}
			}*/
			return list;
			}
			}

	cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -67,7 +67,7 @@
			@ApiModelProperty(value = "计量单位")
			private String unit;

			@ValueTableShow(6)
			@ValueTableShow(15)
			@ApiModelProperty(value = "试验方法")
			private String method;