diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 8cf7df0..c75905b 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -363,6 +363,7 @@ public class EntrustServiceImpl extends BaseServiceImpl } } Map result = new HashMap<>(); +// position1 if ("1".equals(entrust.getInvestigativeType())) { result.put("investigativeType", "委托"); } @@ -380,6 +381,7 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("facsimile", entrust.getFacsimile()); result.put("phone", entrust.getPhone()); result.put("simpleSource", entrust.getSimpleSource()); + // position1 if ("0".equals(entrust.getReportSendType())) { result.put("reportSendType", "自取"); } @@ -583,6 +585,7 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("acceptanceNum", entrust.getAcceptanceNum()); result.put("simpleName", entrust.getSimpleName()); result.put("entrustCustomerName", entrust.getEntrustCustomerName()); + // position1 if ("1".equals(entrust.getInvestigativeType())) { result.put("investigativeType", "委托"); } @@ -716,6 +719,7 @@ public class EntrustServiceImpl extends BaseServiceImpl instrumentName += s2 + ","; } result.put("9", instrumentName); + // position1 if ("0".equals(examineResult.getSimpleStatus())) { result.put("10", "状态一"); } @@ -755,6 +759,7 @@ public class EntrustServiceImpl extends BaseServiceImpl // 如果是布鲁氏检测 + // position1 if ("2".equals(byId.getInputMode())) { List list = JSON.parseArray(examineResult.getExamineDataArr(), ExamineTemplate2Excel.class); if (list.size() > 0) { @@ -799,7 +804,7 @@ public class EntrustServiceImpl extends BaseServiceImpl return o1.getOrder() - o2.getOrder(); } }); - + // position1 if ("3".equals(byId.getInputMode())) { // 口蹄疫兰所单板 if ("1".equals(examine.getTemplateType())) { @@ -883,6 +888,7 @@ public class EntrustServiceImpl extends BaseServiceImpl } url = LDanreportPrint; } + // position1 // 口蹄疫兰所多板 else if ("2".equals(examine.getTemplateType())) { if (list.size() > 0) { @@ -1638,6 +1644,7 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("deptName", deptName); result.put("acceptanceNum", entrust.getAcceptanceNum()); if (eTask != null) { + // position1 if ("1".equals(eTask.getSimpleType())) { result.put("simpleType", "☑正样 □留样"); } else { @@ -1779,6 +1786,7 @@ public class EntrustServiceImpl extends BaseServiceImpl LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Simple::getEntrustId, id); wrapper.eq(Simple::getStatus, 1); + // position1 wrapper.eq(Simple::getIsReagent, "1"); List simpleList = simpleService.list(wrapper); if (simpleList != null && simpleList.size() > 0) { diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java index adc0e90..d0ea13d 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java @@ -68,6 +68,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl examines = examineService.list(examineQueryWrapper); boolean isAllFinish = true; for (Examine examine : examines) { + // position1 if (examine.getIsFinished().equals("0")) { isAllFinish = false; break; @@ -176,6 +177,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl list = examineService.list(examineQueryWrapper); boolean isAllFinish = true; for (Examine examine : list) { + // position1 if (examine.getIsFinished().equals("0")) { isAllFinish = false; break; diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java index 6b38be9..79242ea 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java @@ -71,6 +71,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl userList = userClient.listDeptUserByCurrentUser(eTask.getDeptId().toString()).getData(); if (userList != null) { for (User user : userList) { + // position1 if ("1432876315142520834".equals(user.getRoleId())) { messageClient.event(SysTypeEnum.INFORM.getValue(), "新的检验", "你有新的检验待领取,请及时处理", 1, 5, user.getId().toString(),"/plugin/workflow/process/experimentcrew"); @@ -139,6 +140,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl