From 7e59d751dc8cbbfc4cb7469842a9cc2ee68330cc Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Wed, 17 Jul 2024 21:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B6=85=E5=A3=B0=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
.../admin/applyform/ApplyformController.java | 2 +-
.../config/SecurityConfiguration.java | 1 +
.../vo/PatientexamlistRespVO.java | 13 ++
.../patientexamlist/PatientexamlistDO.java | 11 ++
.../pom.xml | 6 +-
.../yudao-module-ultrasoniccom-api}/pom.xml | 4 +-
.../yudao-module-ultrasoniccom-biz}/pom.xml | 16 ++-
.../controller/admin/ultrasonic/Tree.java | 25 ++++
.../ultrasonic/ultrasonicController.java | 128 ++++++++++++++++++
.../dal/ultrasonic/ultrasonicDO.java | 108 +++++++++++++++
.../dal/ultrasonic/ultrasonicMapper.java | 14 ++
.../service/ultrasonic/ultrasonicService.java | 17 +++
.../ultrasonic/ultrasonicServiceImpl.java | 22 +++
.../mapper/ultrasonic/ultrasonicMapper.xml | 14 ++
yudao-server/pom.xml | 2 +-
16 files changed, 374 insertions(+), 11 deletions(-)
rename {ultrasonicCom => yudao-module-ultrasoniccom}/pom.xml (80%)
rename {ultrasonicCom/ultrasonic-api => yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-api}/pom.xml (89%)
rename {ultrasonicCom/ultrasonic-biz => yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz}/pom.xml (88%)
create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/Tree.java
create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java
create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/ultrasonicDO.java
create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/dal/ultrasonic/ultrasonicMapper.java
create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicService.java
create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/service/ultrasonic/ultrasonicServiceImpl.java
create mode 100644 yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/resources/mapper/ultrasonic/ultrasonicMapper.xml
diff --git a/pom.xml b/pom.xml
index 0b6c308bd..e785e6689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
yudao-module-infra
yudao-module-tblist
yudao-module-applyregistration
- ultrasonicCom
+ yudao-module-ultrasoniccom
diff --git a/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java b/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java
index 6f8ef40f3..6affab1be 100644
--- a/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java
+++ b/yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java
@@ -177,7 +177,7 @@ public class ApplyformController {
@Operation(summary = "批量分检更新")
@Parameter(name = "id", description = "机构ID", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('applyregistration:applyform:update')")
- public CommonResult batchupdateFJApplyform( @RequestBody List deviceVOList) {
+ public CommonResult batchupdateFJApplyform(@RequestBody List deviceVOList) {
if (!deviceVOList.isEmpty())
{
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
index 2f22f4fb9..b7fc273cb 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
@@ -39,6 +39,7 @@ public class SecurityConfiguration {
.antMatchers(adminSeverContextPath + "/**").anonymous();
// 文件读取
registry.antMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll();
+
}
};
diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java
index 7d7d1fb79..6b6612116 100644
--- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java
+++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/PatientexamlistRespVO.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@@ -106,4 +107,16 @@ public class PatientexamlistRespVO {
@Schema(description = "框架需要:创建时间")
private LocalDateTime createTime;
+ @Schema(description = "检查项目代码")
+ private String examItemCode;
+
+ @Schema(description = "登记单号")
+ private String regId;
+
+ @Schema(description = "影像设备名称")
+ private String deviceName;
+
+ @Schema(description = "阴性阳性标记:0 为阴性, 1为阳性")
+ private String diagFlag;
+
}
\ No newline at end of file
diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java
index d30be4dc1..166ddb14e 100644
--- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java
+++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/dataobject/patientexamlist/PatientexamlistDO.java
@@ -146,4 +146,15 @@ public class PatientexamlistDO extends BaseDO {
@TableField(value = "thumbnailImgUrl")
private String thumbnailImgUrl;
+ @TableField(value = "examItemCode")
+ private String examItemCode;
+
+ @TableField(value = "regId")
+ private String regId;
+
+ @TableField(value = "deviceName")
+ private String deviceName;
+
+ @TableField(value = "diagFlag")
+ private String diagFlag;
}
\ No newline at end of file
diff --git a/ultrasonicCom/pom.xml b/yudao-module-ultrasoniccom/pom.xml
similarity index 80%
rename from ultrasonicCom/pom.xml
rename to yudao-module-ultrasoniccom/pom.xml
index 2dca3e831..064f0eedb 100644
--- a/ultrasonicCom/pom.xml
+++ b/yudao-module-ultrasoniccom/pom.xml
@@ -8,7 +8,7 @@
yudao
${revision}
- ultrasonicCom
+ yudao-module-ultrasoniccom
pom
${project.artifactId}
@@ -17,8 +17,8 @@
demo 模块,主要实现 XXX、YYY、ZZZ 等功能。
- ultrasonic-api
- ultrasonic-biz
+ yudao-module-ultrasoniccom-api
+ yudao-module-ultrasoniccom-biz
diff --git a/ultrasonicCom/ultrasonic-api/pom.xml b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-api/pom.xml
similarity index 89%
rename from ultrasonicCom/ultrasonic-api/pom.xml
rename to yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-api/pom.xml
index bac88d46b..b52322f8d 100644
--- a/ultrasonicCom/ultrasonic-api/pom.xml
+++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-api/pom.xml
@@ -4,11 +4,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
cn.iocoder.boot
- ultrasonicCom
+ yudao-module-ultrasoniccom
${revision}
4.0.0
- ultrasonicCom-api
+ yudao-module-ultrasoniccom-api
jar
${project.artifactId}
diff --git a/ultrasonicCom/ultrasonic-biz/pom.xml b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/pom.xml
similarity index 88%
rename from ultrasonicCom/ultrasonic-biz/pom.xml
rename to yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/pom.xml
index b2f1691ef..19e9714da 100644
--- a/ultrasonicCom/ultrasonic-biz/pom.xml
+++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/pom.xml
@@ -4,11 +4,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
cn.iocoder.boot
- ultrasonicCom
+ yudao-module-ultrasoniccom
${revision}
4.0.0
- ultrasonicCom-biz
+ yudao-module-ultrasoniccom-biz
jar
${project.artifactId}
@@ -20,7 +20,12 @@
cn.iocoder.boot
- ultrasonicCom-api
+ yudao-module-applyregistration-biz
+ ${revision}
+
+
+ cn.iocoder.boot
+ yudao-module-ultrasoniccom-api
${revision}
@@ -120,6 +125,11 @@
com.xingyuv
spring-boot-starter-captcha-plus
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-excel
+ 2.1.0-jdk8-snapshot
+
diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/Tree.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/Tree.java
new file mode 100644
index 000000000..f975d544b
--- /dev/null
+++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/Tree.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Tree {
+
+ public String id;
+ public String cname;
+ public String pid;
+ public String tempname;
+ public String examDescription;
+ public String diagResults;
+ public List children;
+// public Tree(String id, String cname, String pid,String tempname,String examDescription,String diagResults) {
+// this.id = id;
+// this.pid = pid;
+// this.cname = cname;
+// this.tempname = tempname;
+// this.examDescription = examDescription;
+// this.diagResults = diagResults;
+// }
+}
diff --git a/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java
new file mode 100644
index 000000000..f116e175f
--- /dev/null
+++ b/yudao-module-ultrasoniccom/yudao-module-ultrasoniccom-biz/src/main/java/cn/iocoder/yudao/module/ultrasoniccom/controller/admin/ultrasonic/ultrasonicController.java
@@ -0,0 +1,128 @@
+package cn.iocoder.yudao.module.ultrasoniccom.controller.admin.ultrasonic;
+
+import cn.iocoder.yudao.module.ultrasoniccom.dal.ultrasonic.ultrasonicDO;
+import cn.iocoder.yudao.module.ultrasoniccom.service.ultrasonic.ultrasonicService;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
+import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.ApplyformController;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+@Tag(name = "管理后台 - 超声科组件")
+@RestController
+@RequestMapping("/ultrasoniccom/ultrasonic")
+@Validated
+public class ultrasonicController {
+
+ private static final Logger log = LoggerFactory.getLogger(ApplyformController.class);
+ @Resource
+ private ultrasonicService ultrasonicService;
+
+
+ @GetMapping("/reporttemplatetlist")
+ @Operation(summary = "获取模版表数据")
+ @DataPermission(enable = false)
+ @PreAuthorize("@ss.hasPermission('ultrasoniccom:ultrasonic:create')")
+ public CommonResult> getreporttemplatelist(@RequestParam("orgID") String orgID,@RequestParam("type") String type,@RequestParam("isprivate") String isprivate) throws Exception {
+ List devicelist = ultrasonicService.getreporttemplate();
+ List filteredList=new ArrayList<>();
+
+ if (!orgID.isEmpty())
+ {
+ filteredList = devicelist.stream()
+ .filter(ultrasonicDO -> (ultrasonicDO.getOrgId().equals(orgID)))
+ .collect(Collectors.toList());
+ }
+ if(filteredList.isEmpty())
+ {
+ filteredList=devicelist;
+ }
+ if (!type.isEmpty()&&!type.equals("undefined"))
+ {
+ // 筛选条件:
+ filteredList = filteredList.stream()
+ .filter(ultrasonicDO -> (ultrasonicDO.getTemplateType().equals(type)))
+ .collect(Collectors.toList());
+ }
+ if(isprivate.equals("1"))
+ {
+ // 筛选条件:
+ filteredList = filteredList.stream()
+ .filter(ultrasonicDO -> (ultrasonicDO.getPrivateDoctorId()!=null))
+ .collect(Collectors.toList());
+ }
+
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(filteredList);
+
+ List tree = convertJsonToTree(json);
+
+ return success(tree);
+ }
+
+
+ //返回树结构
+ private List convertJsonToTree(String jsonData) {
+ List