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/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-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 9090611..2d37bcf 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);
@@ -831,8 +831,7 @@ public class ExamineResultController extends BladeController {
List read = ExcelUtil.read(file, ExamineTemplate2Excel.class);
if (read != null && read.size() > 0) {
// 布鲁氏杆菌抗体检测(平板凝集)
- // TODO 需要换掉硬编码 ↓
- if (examine.getExamineItemId() == 1544979879090921474L) {
+ if ("2".equals(examine.getInputMode())) {
for (ExamineTemplate2Excel excel : read) {
if ("+".equals(excel.getValue())) {
excel.setResult("阳性");
@@ -844,7 +843,7 @@ public class ExamineResultController extends BladeController {
}
}
// 布鲁氏杆菌抗体检测（试管凝集微量法）
- else {
+ else if ("6".equals(examine.getInputMode())){
for (ExamineTemplate2Excel excel : read) {
if ("++++".equals(excel.getValue()) || "+++".equals(excel.getValue()) || "++".equals(excel.getValue())) {
excel.setResult("阳性");
@@ -1574,7 +1573,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);