From 10ec9f4c1bfb2d703756c83a2e01e102db8fd16b Mon Sep 17 00:00:00 2001 From: qk123 <18211963828.@163.cpm> Date: Wed, 26 Nov 2025 10:31:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=96=B9=E6=B3=95=E3=80=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=81=E5=AE=9E=E4=BD=93=E3=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=A1=A8=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/ICheckMethodAppService.java | 25 ++++++ .../appservice/ICheckPartAppService.java | 15 ++++ .../impl/CheckMethodAppServiceImpl.java | 84 +++++++++++++++++++ .../impl/CheckPartAppServiceImpl.java | 38 +++++++++ .../controller/CheckMethodController.java | 55 ++++++++++++ .../check/controller/CheckPartController.java | 55 ++++++++++++ .../openhis/web/check/dto/CheckMethodDto.java | 49 +++++++++++ .../openhis/web/check/dto/CheckPartDto.java | 10 +++ .../check/mapper/CheckMethodAppMapper.java | 10 +++ .../web/check/mapper/CheckPartAppMapper.java | 7 ++ .../com/openhis/check/domain/CheckMethod.java | 27 +++--- .../com/openhis/check/domain/CheckPart.java | 20 ++++- 12 files changed, 380 insertions(+), 15 deletions(-) create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java create mode 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java new file mode 100644 index 00000000..e274ac97 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java @@ -0,0 +1,25 @@ +package com.openhis.web.check.appservice; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.core.common.core.domain.R; +import com.openhis.check.domain.CheckMethod; +import com.openhis.web.check.dto.CheckMethodDto; + +/** + * 检查方法Service接口 + * + * @author system + * @date 2025-07-22 + */ +public interface ICheckMethodAppService{ + + R getCheckMethodList(); + + R addCheckMethod(CheckMethodDto checkMethodDto); + + R updateCheckMethod(CheckMethodDto checkPartDto); + + R removeCheckMethod(Long code); + + +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java new file mode 100644 index 00000000..21c378e0 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java @@ -0,0 +1,15 @@ +package com.openhis.web.check.appservice; + +import com.core.common.core.domain.R; +import com.openhis.check.service.ICheckPartService; +import com.openhis.web.check.dto.CheckPartDto; + +public interface ICheckPartAppService { + R getCheckPartList(); + + R addCheckPart(CheckPartDto checkPartDto); + + R removeCheckPart(Long code); + + R updateCheckPart(CheckPartDto checkMethodDto); +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java new file mode 100644 index 00000000..fe128bbf --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java @@ -0,0 +1,84 @@ +package com.openhis.web.check.appservice.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.core.common.core.domain.R; +import com.openhis.check.domain.CheckMethod; +import com.openhis.check.service.ICheckMethodService; +import com.openhis.web.check.appservice.ICheckMethodAppService; +import com.openhis.web.check.dto.CheckMethodDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Slf4j +public class CheckMethodAppServiceImpl implements ICheckMethodAppService { + + @Resource + private ICheckMethodService checkMethodService; + + @Override + public R getCheckMethodList() { + List list = checkMethodService.list(); + return R.ok(list); + } + + @Override + public R addCheckMethod(CheckMethodDto checkMethodDto) { + //1.参数校验 + if(ObjectUtil.isEmpty(checkMethodDto.getName())){ + return R.fail("检查方法名称不能为空"); + } + if(ObjectUtil.isEmpty(checkMethodDto.getCheckType())){ + return R.fail("检查类型不能为空"); + } + if(ObjectUtil.isEmpty(checkMethodDto.getCode())){ + return R.fail("代码不能为空"); + } + //2.判断是否有重复 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(CheckMethod::getName, checkMethodDto.getName()) + .eq(CheckMethod::getCheckType, checkMethodDto.getCheckType()) + .eq(CheckMethod::getCode, checkMethodDto.getCode()); + if (checkMethodService.getOne(wrapper) != null){ + return R.fail("检查方法已存在"); + } + //3.封装实体检查方法 + CheckMethod checkMethod = new CheckMethod(); + checkMethod.setName(checkMethodDto.getName()); + //4.保存添加 + boolean save = checkMethodService.save(checkMethod); + return R.ok(); + } + + @Override + public R updateCheckMethod(CheckMethodDto checkMethodDto) { + //1.参数校验 + if(ObjectUtil.isEmpty(checkMethodDto.getName())){ + return R.fail("检查方法名称不能为空"); + } + if(ObjectUtil.isEmpty(checkMethodDto.getCheckType())){ + return R.fail("检查类型不能为空"); + } + if(ObjectUtil.isEmpty(checkMethodDto.getCode())){ + return R.fail("代码不能为空"); + } + //2. + return R.ok(); + } + + @Override + public R removeCheckMethod(Long code) { + if (ObjectUtil.isEmpty(code)){ + return R.fail("检查方法代码不能为空"); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper().eq(CheckMethod::getCode, code); + boolean remove = checkMethodService.remove(wrapper); + return R.ok(remove); + } + + +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java new file mode 100644 index 00000000..e3f131c8 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java @@ -0,0 +1,38 @@ +package com.openhis.web.check.appservice.impl; + +import com.core.common.core.domain.R; +import com.openhis.check.domain.CheckPart; +import com.openhis.check.service.ICheckPartService; +import com.openhis.web.check.appservice.ICheckPartAppService; +import com.openhis.web.check.dto.CheckPartDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +@Service +@Slf4j +public class CheckPartAppServiceImpl implements ICheckPartAppService { + @Resource + private ICheckPartService checkPartService; + @Override + public R getCheckPartList() { + List list = checkPartService.list(); + return R.ok(list); + } + + @Override + public R addCheckPart(CheckPartDto checkPartDto) { + return R.ok(); + } + + @Override + public R removeCheckPart(Long code) { + return R.ok(); + } + + @Override + public R updateCheckPart(CheckPartDto checkPartDto) { + return R.ok(); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java new file mode 100644 index 00000000..d051188d --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java @@ -0,0 +1,55 @@ +package com.openhis.web.check.controller; + +import com.core.common.core.domain.R; +import com.openhis.web.check.appservice.ICheckMethodAppService; +import com.openhis.web.check.dto.CheckMethodDto; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + + +@RestController +@Slf4j +@RequestMapping("/check/method") +public class CheckMethodController { + @Resource + private ICheckMethodAppService checkMethodAppService; + + /* + * 获取检查方法 + * @Param检查方法 此处参数注释有问题，完全是按照需求给的图来注释的 + */ + @GetMapping("/list") + public R getCheckMethodList(){ + return R.ok(checkMethodAppService.getCheckMethodList()); + } + + /* + * 新增检查方法 + * @Param + */ + @PostMapping("/add") + public R addCheckMethod(@RequestBody CheckMethodDto checkMethodDto){ + return R.ok(checkMethodAppService.addCheckMethod(checkMethodDto)); + } + + /* + * 删除检查方法 + * @Param code代码 + */ + @DeleteMapping("/delete/{code}") + public R deleteCheckMethod(@PathVariable Long code){ + return R.ok(checkMethodAppService.removeCheckMethod(code)); + } + + /* + * 更新检查方法 + * @Param + */ + @PutMapping("/update") + public R updateCheckMethod(@RequestBody CheckMethodDto checkMethodDto){ + return R.ok(checkMethodAppService.updateCheckMethod(checkMethodDto)); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java new file mode 100644 index 00000000..6895f0dd --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java @@ -0,0 +1,55 @@ +package com.openhis.web.check.controller; + +import com.core.common.core.domain.R; +import com.openhis.check.service.ICheckPartService; +import com.openhis.web.check.appservice.ICheckPartAppService; +import com.openhis.web.check.dto.CheckMethodDto; +import com.openhis.web.check.dto.CheckPartDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@Slf4j +@RequestMapping("/check/part") +public class CheckPartController { + @Resource + private ICheckPartAppService checkPartAppService; + + /* + * 获取检查部位 + * @Param检查方法 此处参数注释有问题，完全是按照需求给的图来注释的 + */ + @GetMapping("/list") + public R getCheckMethodList(){ + return R.ok(checkPartAppService.getCheckPartList()); + } + + /* + * 新增检查部位 + * @Param + */ + @PostMapping("/add") + public R addCheckMethod(@RequestBody CheckPartDto checkPartDto){ + return R.ok(checkPartAppService.addCheckPart(checkPartDto)); + } + + /* + * 删除检查部位 + * @Param code代码 + */ + @DeleteMapping("/delete/{code}") + public R deleteCheckMethod(@PathVariable Long code){ + return R.ok(checkPartAppService.removeCheckPart(code)); + } + + /* + * 更新检查部位 + * @Param + */ + @PutMapping("/update") + public R updateCheckMethod(@RequestBody CheckPartDto checkMethodDto){ + return R.ok(checkPartAppService.updateCheckPart(checkMethodDto)); + } +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java new file mode 100644 index 00000000..68447d90 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckMethodDto.java @@ -0,0 +1,49 @@ +package com.openhis.web.check.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Data +@Accessors(chain = true) +public class CheckMethodDto { + + /** + * 检查方法ID + */ + @TableId(type = IdType.AUTO) + private Long id; + + /* 检查类型 */ + private String checkType; + + /* 方法代码 */ + private String code; + + /* 方法名称 */ + private String name; + + /* 套餐名称 */ + private String packageName; + + /* 曝光次数 */ + private Integer exposureNum; + + /* 序号 */ + private Integer orderNum; + + /* 备注 */ + private String remark; + + /** 创建时间 */ + private LocalDateTime createTime; + + /** 更新时间 */ + private LocalDateTime updateTime; +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java new file mode 100644 index 00000000..46f53e97 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/dto/CheckPartDto.java @@ -0,0 +1,10 @@ +package com.openhis.web.check.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class CheckPartDto { + +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java new file mode 100644 index 00000000..f6ca47b3 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckMethodAppMapper.java @@ -0,0 +1,10 @@ +package com.openhis.web.check.mapper; + + +import org.springframework.stereotype.Repository; + + +@Repository +public interface CheckMethodAppMapper{ + +} diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java new file mode 100644 index 00000000..007bdcc2 --- /dev/null +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/mapper/CheckPartAppMapper.java @@ -0,0 +1,7 @@ +package com.openhis.web.check.mapper; + +import org.springframework.stereotype.Repository; + +@Repository +public interface CheckPartAppMapper { +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java index 807f8347..56f549cc 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckMethod.java @@ -22,26 +22,31 @@ import java.time.LocalDateTime; public class CheckMethod { private static final long serialVersionUID = 1L; - /** 检查方法ID */ + /** + * 检查方法ID + */ @TableId(type = IdType.AUTO) private Long id; - /** 检查方法名称 */ - private String name; + /* 检查类型 */ + private String checkType; - /** 检查方法编码 */ + /* 方法代码 */ private String code; - /** 检查方法类型 */ - private String methodType; + /* 方法名称 */ + private String name; - /** 检查类型ID */ - private Long checkTypeId; + /* 套餐名称 */ + private String packageName; - /** 序号 */ - private Integer number; + /* 曝光次数 */ + private Integer exposureNum; - /** 备注 */ + /* 序号 */ + private Integer orderNum; + + /* 备注 */ private String remark; /** 创建时间 */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java index 10ee1cac..85a82e92 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPart.java @@ -32,15 +32,27 @@ public class CheckPart { /** 检查部位编码 */ private String code; - /** 部位分类 */ - private String partCategory; + /** 检查部位检查类型 */ + private String checkType; - /** 父部位ID */ - private Long parentId; + /** 曝光次数 */ + private Integer exposureNum; + + /** 费用套餐 */ + private String packageName; + + /** 金额 */ + private Double price; /** 序号 */ private Integer number; + /** 服务范围 */ + private String serviceScope; + + /** 下级医技类型 */ + private String subType; + /** 备注 */ private String remark;