diff --git a/lab-service-api/lab-file-api/lab-file-api.iml b/lab-service-api/lab-file-api/lab-file-api.iml
new file mode 100644
index 0000000..fb3b85b
--- /dev/null
+++ b/lab-service-api/lab-file-api/lab-file-api.iml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java
index 76ebc5b..0ee097c 100644
--- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java
+++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java
@@ -72,7 +72,6 @@ public class QualityFile extends BaseEntity implements Serializable {
private String type;
@ApiModelProperty(value = "所属分类id")
- @NotNull
private Long categoryId;
@ApiModelProperty(value = "在用的部门ids")
diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/QualityFileVO.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/QualityFileVO.java
index 8e4e3e5..6acf74a 100644
--- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/QualityFileVO.java
+++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/QualityFileVO.java
@@ -37,6 +37,12 @@ import java.util.Set;
public class QualityFileVO extends QualityFile {
private static final long serialVersionUID = 1L;
+ /**
+ * 版本名
+ */
+ @ApiModelProperty(value = "版本")
+ private String versionName;
+
@ApiModelProperty(value = "部门ids")
private Set deptIds;
diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java
index 026a909..6446272 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java
@@ -51,7 +51,10 @@ public class QualityFileAssistentController extends BladeController {
file.setId(assistentId);
// 处理文件实体与关联
Set fileRels = file.getFiles();
- fileRels.forEach(dto -> dto.setAssistantId(file.getId()));
+ fileRels.forEach(dto -> {
+ dto.setStorageFileId(dto.getStorageFileId());
+ dto.setAssistantId(file.getId());
+ });
//重新保存文件与存储关联关系
qualityStorageFileRelService.saveBatch(new ArrayList<>(fileRels));
diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java
index 198b3e9..950922c 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java
@@ -93,6 +93,15 @@ public class QualityFileController extends BladeController {
@ApiOperation(value = "分页", notes = "传入qualityFile")
public R> page(QualityFileVO qualityFile, Query query) {
IPage pages = qualityFileService.selectQualityFilePage(Condition.getPage(query), qualityFile);
+ List records = pages.getRecords();
+ for (QualityFileVO record : records) {
+ Integer version = record.getVersion();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("quality_file_id", record.getId()).eq("version", version);
+ QualityFileAssistent one = qualityFileAssistentService.getOne(queryWrapper);
+ record.setVersionName(one.getName());
+ }
+ pages.setRecords(records);
return R.data(pages);
}
diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
index 1027aef..93d69a6 100644
--- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
+++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
@@ -108,6 +108,7 @@ public class QualityFileServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(Long.valueOf(taskBlueprint.getBackCrossRecipientBy()));
+ User user = userR.getData();
+ if (user != null) {
+ taskBlueprint.setBackCrossRecipientName(user.getName());
+ }
+ // 处理任务书回交人返回用户名称
+ R userTemp = userClient.userInfoById(Long.valueOf(taskBlueprint.getTaskIssuedBy()));
+ User user1 = userR.getData();
+ if (user1 != null) {
+ taskBlueprint.setTaskIssuedBy(user1.getName());
+ }
}
if ("1".equals(entrust.getEntrustStatus())) {
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
index 8664574..1a13e32 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
@@ -82,7 +82,7 @@ public class ExamineResultController extends BladeController {
public R excel(MultipartFile file, String examineId) throws Exception {
Examine examine = examineService.getById(examineId);
ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
- if ("2".equals(examineItem.getInputMode())) {
+ if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) {
return blsExcel(file, examineId);
} else if ("3".equals(examineItem.getInputMode())) {
return ktyExcel(file, examineId);
@@ -828,11 +828,11 @@ public class ExamineResultController extends BladeController {
*/
private R blsExcel(MultipartFile file, String examineId) throws Exception {
Examine examine = examineService.getById(examineId);
+ ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
List read = ExcelUtil.read(file, ExamineTemplate2Excel.class);
if (read != null && read.size() > 0) {
// 布鲁氏杆菌抗体检测(平板凝集)
- // TODO 需要换掉硬编码 ↓
- if (examine.getExamineItemId() == 1544979879090921474L) {
+ if ("2".equals(examineItem.getInputMode())) {
for (ExamineTemplate2Excel excel : read) {
if ("+".equals(excel.getValue())) {
excel.setResult("阳性");
@@ -844,7 +844,7 @@ public class ExamineResultController extends BladeController {
}
}
// 布鲁氏杆菌抗体检测（试管凝集微量法）
- else {
+ else if ("6".equals(examineItem.getInputMode())) {
for (ExamineTemplate2Excel excel : read) {
if ("++++".equals(excel.getValue()) || "+++".equals(excel.getValue()) || "++".equals(excel.getValue())) {
excel.setResult("阳性");
@@ -1082,14 +1082,14 @@ public class ExamineResultController extends BladeController {
data1.put("log2", isPig ? "≥1:64" : "≥1:128");
data1.put("result", "阳性");
allDatas.add(data1);
- yangCount ++;
- simpleCount ++;
+ yangCount++;
+ simpleCount++;
} else {
data1.put("log2", isPig ? "<1:64" : "<1:128");
data1.put("result", "阴性");
allDatas.add(data1);
- yinCount ++;
- simpleCount ++;
+ yinCount++;
+ simpleCount++;
}
}
}
@@ -1219,14 +1219,14 @@ public class ExamineResultController extends BladeController {
data1.put("log2", isPig ? "≥1:64" : "≥1:128");
data1.put("result", "阳性");
allDatas.add(data1);
- yangCount ++;
- simpleCount ++;
+ yangCount++;
+ simpleCount++;
} else {
data1.put("log2", isPig ? "<1:64" : "<1:128");
data1.put("result", "阴性");
allDatas.add(data1);
- yinCount ++;
- simpleCount ++;
+ yinCount++;
+ simpleCount++;
}
}
}
@@ -1310,17 +1310,21 @@ public class ExamineResultController extends BladeController {
}
Map cPosData = new HashMap<>(4);
int b = (group * 96) + row;
+ int order = (group * 192) + row;
if (col != 1) {
b += (u * 8);
+ order += (u * 8);
}
boolean isIncludeCurr = col == 12 ? false : (examineType == 1 && col == 11 ? false : true);
if (value != null && isIncludeCurr) {
cPosData.put("value", value);
// 如果是参照组
if (a == 1) {
- cPosData.put("order", b + 1);
+// cPosData.put("order", b + 1);
+ cPosData.put("order", order + 1);
} else {
- cPosData.put("order", b + 1 + 96);
+// cPosData.put("order", b + 1 + 96);
+ cPosData.put("order", order + 1 + 96);
}
cPosData.put("num", experieNum[b - ((group + 1) * 6 + (group * 16))]);
cPosData.put("result", Double.parseDouble(value) > avg ? "阳性" : "阴性");
@@ -1329,9 +1333,11 @@ public class ExamineResultController extends BladeController {
cPosData.put("value", value != null ? value : " ");
// 如果是参照组
if (a == 1) {
- cPosData.put("order", b + 1);
+// cPosData.put("order", b + 1);
+ cPosData.put("order", order + 1);
} else {
- cPosData.put("order", b + 1 + 96);
+// cPosData.put("order", b + 1 + 96);
+ cPosData.put("order", order + 1 + 96);
}
return cPosData;
}
@@ -1574,7 +1580,7 @@ public class ExamineResultController extends BladeController {
ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
// 如果是布鲁氏杆菌抗体检测
- if ("2".equals(examineItem.getInputMode())) {
+ if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) {
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SimpleDoExamineLog::getExamineId, id);
wrapper.eq(SimpleDoExamineLog::getIsFinished, 0);
@@ -1686,7 +1692,7 @@ public class ExamineResultController extends BladeController {
* 上传检测结果照片
*/
@PostMapping("/resultPicture")
- public R resultPicture(@RequestParam MultipartFile file, @RequestParam String examineId) {
+ public R resultPicture(@RequestParam MultipartFile file, @RequestParam(required = false) String examineId) {
return R.data(service.resultPicture(file, examineId));
}
}
\ No newline at end of file
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 623cd85..1a6e474 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
@@ -417,7 +417,7 @@ public class EntrustServiceImpl extends BaseServiceImpl
ExamineResult examineResult = getExamineResultByExamineId(examine.getId());
// 布鲁氏检测
- if ("2".equals(examineItem.getInputMode())) {
+ if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) {
List list = JSON.parseArray(examineResult.getExamineDataArr(), ExamineTemplate2Excel.class);
if (list != null && list.size() > 0) {
for (int i1 = 0; i1 < list.size(); i1++) {
@@ -724,9 +724,15 @@ public class EntrustServiceImpl extends BaseServiceImpl
String result = "";
for (int i = 0; i < currExamResVoList.size(); i++) {
ExamineResultVo resultVo = currExamResVoList.get(i);
- num += resultVo.getNum() + ",";
- value += resultVo.getValue() + ",";
- result += resultVo.getResult() + ",";
+ if (i == currExamResVoList.size() - 1) {
+ num += resultVo.getNum();
+ value += resultVo.getValue();
+ result += resultVo.getResult();
+ } else {
+ num += resultVo.getNum() + ",";
+ value += resultVo.getValue() + ",";
+ result += resultVo.getResult() + ",";
+ }
}
row.put("num" + index, num);
row.put("value" + index, value);
@@ -977,7 +983,7 @@ public class EntrustServiceImpl extends BaseServiceImpl
// 图片路劲
String path = sysClient.getParamValue("electronic_signature_real_path").getData();
// 编制人签名
- if (StringUtil.isBlank(entrust.getOrganizationBy())) {
+ if (StringUtil.isNotBlank(entrust.getOrganizationBy())) {
User user = userClient.userInfoById(Long.parseLong(entrust.getOrganizationBy())).getData();
ImageEntity farView = new ImageEntity();
farView.setHeight(50);//设置高度
@@ -995,7 +1001,7 @@ public class EntrustServiceImpl extends BaseServiceImpl
result1.put("1", farView);
}
// 审核人签名
- if (StringUtil.isBlank(entrust.getVerifyBy())) {
+ if (StringUtil.isNotBlank(entrust.getVerifyBy())) {
User user = userClient.userInfoById(Long.parseLong(entrust.getVerifyBy())).getData();
ImageEntity farView = new ImageEntity();
farView.setHeight(50);//设置高度
@@ -1013,7 +1019,7 @@ public class EntrustServiceImpl extends BaseServiceImpl
result1.put("2", farView);
}
// 审批人签名
- if (StringUtil.isBlank(entrust.getApprovalBy())) {
+ if (StringUtil.isNotBlank(entrust.getApprovalBy())) {
User user = userClient.userInfoById(Long.parseLong(entrust.getApprovalBy())).getData();
ImageEntity farView = new ImageEntity();
farView.setHeight(50);//设置高度
@@ -1189,11 +1195,13 @@ public class EntrustServiceImpl extends BaseServiceImpl
// String value = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examineResult.getSimpleStatus());
result.put("10", examineResult.getSimpleStatus());
result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH");
-// result.put("12", examineWay.getOperation());
+ // 操作程序内容
result.put("12", examineResult.getOperateContent().replace("$", "\n"));
- if (examineBasis != null) {
- result.put("13", examineBasis.getContent().replace("$", "(char)11"));
- }
+// if (examineBasis != null) {
+// result.put("13", examineBasis.getContent().replace("$", "(char)11"));
+// }
+ // 结果判定方法和依据
+ result.put("13", examineResult.getExamineBasisContent().replace("$", "\n"));
String path = sysClient.getParamValue("electronic_signature_real_path").getData();
// 检测人
if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) {
@@ -1930,9 +1938,9 @@ public class EntrustServiceImpl extends BaseServiceImpl
ExamineDataArrVO dataArrVO1 = new ExamineDataArrVO();
ExamineDataArrVO dataArrVO2 = new ExamineDataArrVO();
dataArrVO1.setNum("阴性数量");
- dataArrVO1.setValue(String.valueOf(yin));
+ dataArrVO1.setLog2(String.valueOf(yin));
dataArrVO2.setNum("阳性数量");
- dataArrVO2.setValue(String.valueOf(yang));
+ dataArrVO2.setLog2(String.valueOf(yang));
list1.add(dataArrVO1);
list1.add(dataArrVO2);
@@ -1963,15 +1971,15 @@ public class EntrustServiceImpl extends BaseServiceImpl
for (int i = 0; i < voList.size() / 3; i++) {
Map map = new HashMap<>();
map.put("num1", voList.get(i).getNum());
- map.put("value1", voList.get(i).getValue());
+ map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i).getNum());
- map.put("value2", voList.get(voList.size() / 3 + i).getValue());
+ map.put("log2", voList.get(voList.size() / 3 + i).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i).getNum());
- map.put("value3", voList.get(voList.size() / 3 * 2 + i).getValue());
+ map.put("log3", voList.get(voList.size() / 3 * 2 + i).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i).getResult());
resultList1.add(map);
}
@@ -1980,28 +1988,28 @@ public class EntrustServiceImpl extends BaseServiceImpl
if (voList.size() % 3 == 1) {
Map map = new HashMap<>();
map.put("num1", voList.get(i).getNum());
- map.put("value1", voList.get(i).getValue());
+ map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult());
if (i < voList.size() / 3) {
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
- map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue());
+ map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 1).getNum());
- map.put("value3", voList.get(voList.size() / 3 * 2 + i + 1).getValue());
+ map.put("log3", voList.get(voList.size() / 3 * 2 + i + 1).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 1).getResult());
}
resultList1.add(map);
} else if (voList.size() % 3 == 2) {
Map map = new HashMap<>();
map.put("num1", voList.get(i).getNum());
- map.put("value1", voList.get(i).getValue());
+ map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
- map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue());
+ map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
if (i < voList.size() / 3) {
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 2).getNum());
- map.put("value3", voList.get(voList.size() / 3 * 2 + i + 2).getValue());
+ map.put("log3", voList.get(voList.size() / 3 * 2 + i + 2).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 2).getResult());
}
resultList1.add(map);
@@ -2223,9 +2231,9 @@ public class EntrustServiceImpl extends BaseServiceImpl
ExamineDataArrVO dataArrVO1 = new ExamineDataArrVO();
ExamineDataArrVO dataArrVO2 = new ExamineDataArrVO();
dataArrVO1.setNum("阴性数量");
- dataArrVO1.setValue(String.valueOf(yin));
+ dataArrVO1.setLog2(String.valueOf(yin));
dataArrVO2.setNum("阳性数量");
- dataArrVO2.setValue(String.valueOf(yang));
+ dataArrVO2.setLog2(String.valueOf(yang));
list1.add(dataArrVO1);
list1.add(dataArrVO2);
@@ -2256,15 +2264,15 @@ public class EntrustServiceImpl extends BaseServiceImpl
for (int i = 0; i < voList.size() / 3; i++) {
Map map = new HashMap<>();
map.put("num1", voList.get(i).getNum());
- map.put("value1", voList.get(i).getValue());
+ map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i).getNum());
- map.put("value2", voList.get(voList.size() / 3 + i).getValue());
+ map.put("log2", voList.get(voList.size() / 3 + i).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i).getNum());
- map.put("value3", voList.get(voList.size() / 3 * 2 + i).getValue());
+ map.put("log3", voList.get(voList.size() / 3 * 2 + i).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i).getResult());
resultList1.add(map);
}
@@ -2273,28 +2281,28 @@ public class EntrustServiceImpl extends BaseServiceImpl
if (voList.size() % 3 == 1) {
Map map = new HashMap<>();
map.put("num1", voList.get(i).getNum());
- map.put("value1", voList.get(i).getValue());
+ map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult());
if (i < voList.size() / 3) {
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
- map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue());
+ map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 1).getNum());
- map.put("value3", voList.get(voList.size() / 3 * 2 + i + 1).getValue());
+ map.put("log3", voList.get(voList.size() / 3 * 2 + i + 1).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 1).getResult());
}
resultList1.add(map);
} else if (voList.size() % 3 == 2) {
Map map = new HashMap<>();
map.put("num1", voList.get(i).getNum());
- map.put("value1", voList.get(i).getValue());
+ map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
- map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue());
+ map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
if (i < voList.size() / 3) {
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 2).getNum());
- map.put("value3", voList.get(voList.size() / 3 * 2 + i + 2).getValue());
+ map.put("log3", voList.get(voList.size() / 3 * 2 + i + 2).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 2).getResult());
}
resultList1.add(map);
@@ -3191,7 +3199,6 @@ public class EntrustServiceImpl extends BaseServiceImpl
}
List> resultList = new ArrayList<>();
- Map map = new HashMap<>();
LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Examine::getEntrustId, id);
@@ -3199,6 +3206,7 @@ public class EntrustServiceImpl extends BaseServiceImpl
List examineList = examineService.list(queryWrapper);
if (CollectionUtils.isNotEmpty(examineList)) {
for (Examine examine : examineList) {
+ Map map = new HashMap<>();
map.put("simpleName", examine.getSimpleName());
map.put("simpleCount", examine.getSimpleCount());
String[] split = examine.getExperieNum().split(",");
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 8fffda4..0d78df6 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
@@ -59,11 +59,6 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
- wrapper1.orderByAsc(Simple::getSort);
- List simples = simpleService.list(wrapper1);
// 如果是追加检验计划提交
if (taskBlueprint.getIsContinue() != null && taskBlueprint.getIsContinue() == 1) {
@@ -95,6 +90,14 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
+ wrapper1.eq(Simple::getSimpleName, examine.getSimpleName());
+ wrapper1.orderByAsc(Simple::getSort);
+ List simples = simpleService.list(wrapper1);
+
SimpleDoExamineLog log = new SimpleDoExamineLog();
log.setExamineId(examine.getId());
log.setIsFinished(0);
@@ -120,6 +123,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl examines = eTask.getExamines();
for (Examine examine : examines) {
+
+ // 获取委托单所有样品
+ LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
+ wrapper1.eq(Simple::getSimpleName, examine.getSimpleName());
+ wrapper1.orderByAsc(Simple::getSort);
+ List simples = simpleService.list(wrapper1);
+
SimpleDoExamineLog log = new SimpleDoExamineLog();
log.setExamineId(examine.getId());
log.setIsFinished(0);
@@ -184,6 +196,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl