suojin
/
project_husbandry_back
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
yitonglei 3 years ago
parent acf5472a88 48e381164a
commit 4a7d1457b5
10 changed files with 278 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 162
      lab-service-api/lab-file-api/lab-file-api.iml
  2. 1
      lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java
  3. 6
      lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/QualityFileVO.java
  4. 5
      lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java
  5. 9
      lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java
  6. 1
      lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
  7. 12
      lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
  8. 42
      lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
  9. 76
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
  10. 24
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java

162
lab-service-api/lab-file-api/lab-file-api.iml
Unescape View File

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springblade:blade-starter-mybatis:2.8.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-typehandlers-jsr310:1.0.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
<orderEntry type="library" name="Maven: org.springblade:blade-starter-auth:2.8.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springblade:blade-core-tool:2.8.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springblade:blade-core-launch:2.8.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.22.Final" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.33.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.3.8.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.0.33.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.0.33.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:1.1.4.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:4.0.4" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:30.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.6.0" level="project" />
<orderEntry type="library" name="Maven: io.protostuff:protostuff-api:1.6.0" level="project" />
<orderEntry type="library" name="Maven: io.protostuff:protostuff-runtime:1.6.0" level="project" />
<orderEntry type="library" name="Maven: io.protostuff:protostuff-collectionschema:1.6.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.springblade:blade-starter-jwt:2.8.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.58.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.58.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.58.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.58.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.58.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.58.Final" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-impl:0.11.2" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.11.2" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-jackson:0.11.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springblade:blade-starter-tenant:2.8.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springblade:blade-starter-cache:2.8.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.3.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.13.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.12" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.12" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.12" level="project" />
<orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.7" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
<orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.19" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.12.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.springblade:blade-core-auto:2.8.1.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.18" level="project" />
</component>
</module>

1
lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFile.java
Unescape View File

@ -72,7 +72,6 @@ public class QualityFile extends BaseEntity implements Serializable {
private String type;
@ApiModelProperty(value = "所属分类id")
@NotNull
private Long categoryId;
@ApiModelProperty(value = "在用的部门ids")

6
lab-service-api/lab-file-api/src/main/java/org/springblade/file/vo/QualityFileVO.java
Unescape View File

@ -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<Long> deptIds;

5
lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java
Unescape View File

@ -51,7 +51,10 @@ public class QualityFileAssistentController extends BladeController {
file.setId(assistentId);
// 处理文件实体与关联
Set<QualityStorageFileRelDTO> 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));

9
lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java
Unescape View File

@ -93,6 +93,15 @@ public class QualityFileController extends BladeController {
@ApiOperation(value = "分页", notes = "传入qualityFile")
public R<IPage<QualityFileVO>> page(QualityFileVO qualityFile, Query query) {
IPage<QualityFileVO> pages = qualityFileService.selectQualityFilePage(Condition.getPage(query), qualityFile);
List<QualityFileVO> records = pages.getRecords();
for (QualityFileVO record : records) {
Integer version = record.getVersion();
QueryWrapper<QualityFileAssistent> 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);
}

1
lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java
Unescape View File

@ -108,6 +108,7 @@ public class QualityFileServiceImpl extends BaseServiceImpl<QualityFileMapper, Q
long fileId = RandomUtils.nextLong();
long assistentId = RandomUtils.nextLong();
qualityFile.setId(fileId);
qualityFile.setVersion(1);
QualityFileAssistent assistent = new QualityFileAssistent();
assistent.setId(assistentId);

12
lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
Unescape View File

@ -597,6 +597,18 @@ public class EntrustController extends BladeController {
}
taskBlueprint.setTasks(eTaskList);
}
// 处理任务书回交人返回用户名称
R<User> userR = userClient.userInfoById(Long.valueOf(taskBlueprint.getBackCrossRecipientBy()));
User user = userR.getData();
if (user != null) {
taskBlueprint.setBackCrossRecipientName(user.getName());
}
// 处理任务书回交人返回用户名称
R<User> userTemp = userClient.userInfoById(Long.valueOf(taskBlueprint.getTaskIssuedBy()));
User user1 = userR.getData();
if (user1 != null) {
taskBlueprint.setTaskIssuedBy(user1.getName());
}
}
if ("1".equals(entrust.getEntrustStatus())) {

42
lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
Unescape View File

@ -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<ExamineTemplate2Excel> 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<String, Object> 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<SimpleDoExamineLog> 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<String> resultPicture(@RequestParam MultipartFile file, @RequestParam String examineId) {
public R<String> resultPicture(@RequestParam MultipartFile file, @RequestParam(required = false) String examineId) {
return R.data(service.resultPicture(file, examineId));
}
}

76
lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
Unescape View File

@ -417,7 +417,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
ExamineResult examineResult = getExamineResultByExamineId(examine.getId());
// 布鲁氏检测
if ("2".equals(examineItem.getInputMode())) {
if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) {
List<ExamineTemplate2Excel> 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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
// 图片路劲
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
// 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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
for (int i = 0; i < voList.size() / 3; i++) {
Map<String, Object> 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<EntrustMapper, Entrust>
if (voList.size() % 3 == 1) {
Map<String, Object> 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<String, Object> 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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
for (int i = 0; i < voList.size() / 3; i++) {
Map<String, Object> 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<EntrustMapper, Entrust>
if (voList.size() % 3 == 1) {
Map<String, Object> 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<String, Object> 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<EntrustMapper, Entrust>
}
List<Map<String, Object>> resultList = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
LambdaQueryWrapper<Examine> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Examine::getEntrustId, id);
@ -3199,6 +3206,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
List<Examine> examineList = examineService.list(queryWrapper);
if (CollectionUtils.isNotEmpty(examineList)) {
for (Examine examine : examineList) {
Map<String, Object> map = new HashMap<>();
map.put("simpleName", examine.getSimpleName());
map.put("simpleCount", examine.getSimpleCount());
String[] split = examine.getExperieNum().split(",");

24
lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/TaskBlueprintServiceImpl.java
Unescape View File

@ -59,11 +59,6 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
@Override
@Transactional(rollbackFor = Exception.class)
public boolean addBluePrint(TaskBlueprint taskBlueprint) {
// 获取委托单所有样品
LambdaQueryWrapper<Simple> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
wrapper1.orderByAsc(Simple::getSort);
List<Simple> simples = simpleService.list(wrapper1);
// 如果是追加检验计划提交
if (taskBlueprint.getIsContinue() != null && taskBlueprint.getIsContinue() == 1) {
@ -95,6 +90,14 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
if (!"".equals(examine.getExperieNum())) {
continue;
}
// 获取委托单所有样品
LambdaQueryWrapper<Simple> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
wrapper1.eq(Simple::getSimpleName, examine.getSimpleName());
wrapper1.orderByAsc(Simple::getSort);
List<Simple> simples = simpleService.list(wrapper1);
SimpleDoExamineLog log = new SimpleDoExamineLog();
log.setExamineId(examine.getId());
log.setIsFinished(0);
@ -120,6 +123,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
examine.setDemandCompletionTime(taskBlueprint.getDemandCompletionTime());
examine.setDeptId(eTask.getDeptId());
examine.setSimpleCurrPlace(simpleCurrPlace);
simpleService.updateBatchById(simples);
}
examineService.updateBatchById(examines);
}
@ -161,6 +165,14 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
eTask.setUpdateTime(new Date());
List<Examine> examines = eTask.getExamines();
for (Examine examine : examines) {
// 获取委托单所有样品
LambdaQueryWrapper<Simple> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(Simple::getEntrustId, taskBlueprint.getEntrustId());
wrapper1.eq(Simple::getSimpleName, examine.getSimpleName());
wrapper1.orderByAsc(Simple::getSort);
List<Simple> simples = simpleService.list(wrapper1);
SimpleDoExamineLog log = new SimpleDoExamineLog();
log.setExamineId(examine.getId());
log.setIsFinished(0);
@ -184,6 +196,7 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
examine.setIsFinished("-1");
examine.setDemandCompletionTime(taskBlueprint.getDemandCompletionTime());
examine.setDeptId(eTask.getDeptId());
simpleService.updateBatchById(simples);
}
examineService.updateBatchById(examines);
}
@ -209,7 +222,6 @@ public class TaskBlueprintServiceImpl extends BaseServiceImpl<TaskBlueprintMappe
this.save(taskBlueprint);
}
simpleService.updateBatchById(simples);
Entrust entrust = new Entrust();
entrust.setId(taskBlueprint.getEntrustId());
entrust.setEntrustStatus("111");

Write Preview
Loading…
Cancel
Save