diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AncillaryItemManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AncillaryItemManageController.java new file mode 100644 index 00000000..61469bf5 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/AncillaryItemManageController.java @@ -0,0 +1,28 @@ +package com.supervision.manage.controller; + + +import com.supervision.manage.service.AncillaryItemManageService; +import com.supervision.vo.ask.AncillaryItemReqVo; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Api(tags = "辅助检查项管理") +@RestController +@RequestMapping("ancillaryItem") +@RequiredArgsConstructor +public class AncillaryItemManageController { + + private final AncillaryItemManageService ancillaryItemManageService; + @ApiOperation("查询辅助检查项目列表") + @GetMapping("queryAncillaryItemList") + public List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { + return ancillaryItemManageService.queryAncillaryItemList(ancillaryItemReqVo); + } +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalToolManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalToolManageController.java new file mode 100644 index 00000000..b744221b --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalToolManageController.java @@ -0,0 +1,28 @@ +package com.supervision.manage.controller; + +import com.supervision.manage.service.PhysicalToolManageService; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Api(tags = "体格检查工具管理") +@RestController +@RequestMapping("physicalTool") +@RequiredArgsConstructor +public class PhysicalToolManageController { + + private final PhysicalToolManageService physicalToolManageService; + + @ApiOperation(value = "查询体格检查的工具列表") + @GetMapping("queryPhysicalToolList") + public List queryPhysicalToolList() { + return physicalToolManageService.queryPhysicalToolList(); + } + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/AncillaryItemManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/AncillaryItemManageService.java new file mode 100644 index 00000000..9c27aa65 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/AncillaryItemManageService.java @@ -0,0 +1,11 @@ +package com.supervision.manage.service; + +import com.supervision.vo.ask.AncillaryItemReqVo; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; + +import java.util.List; + +public interface AncillaryItemManageService { + + List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo); +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/PhysicalToolManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/PhysicalToolManageService.java new file mode 100644 index 00000000..b2b5d478 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/PhysicalToolManageService.java @@ -0,0 +1,10 @@ +package com.supervision.manage.service; + +import com.supervision.vo.ask.ConfigPhysicalToolResVO; + +import java.util.List; + +public interface PhysicalToolManageService { + List queryPhysicalToolList(); + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java new file mode 100644 index 00000000..2da576c4 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java @@ -0,0 +1,21 @@ +package com.supervision.manage.service.impl; + +import com.supervision.manage.service.AncillaryItemManageService; +import com.supervision.service.ConfigAncillaryItemService; +import com.supervision.vo.ask.AncillaryItemReqVo; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class AncillaryItemManageServiceImpl implements AncillaryItemManageService { + + private final ConfigAncillaryItemService configAncillaryItemService; + @Override + public List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { + return configAncillaryItemService.queryAncillaryItemList(ancillaryItemReqVo); + } +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java new file mode 100644 index 00000000..2068b71b --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.manage.service.impl; + +import com.supervision.manage.service.PhysicalToolManageService; +import com.supervision.service.ConfigPhysicalToolService; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class PhysicalToolManageServiceImpl implements PhysicalToolManageService { + + private final ConfigPhysicalToolService configPhysicalToolService; + @Override + public List queryPhysicalToolList() { + return configPhysicalToolService.queryPhysicalToolList(); + } +} diff --git a/virtual-patient-model/src/main/java/com/supervision/service/ConfigAncillaryItemService.java b/virtual-patient-model/src/main/java/com/supervision/service/ConfigAncillaryItemService.java index bc3ef938..648abec1 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/ConfigAncillaryItemService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/ConfigAncillaryItemService.java @@ -3,6 +3,7 @@ package com.supervision.service; import com.supervision.model.ConfigAncillaryItem; import com.baomidou.mybatisplus.extension.service.IService; import com.supervision.vo.ask.AncillaryItemReqVo; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.vo.result.ConfigAncillaryItemVo; import java.util.List; @@ -16,4 +17,6 @@ public interface ConfigAncillaryItemService extends IService queryVoList(AncillaryItemReqVo ancillaryItemReqVo); + + List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/ConfigPhysicalToolService.java b/virtual-patient-model/src/main/java/com/supervision/service/ConfigPhysicalToolService.java index 3c8bb811..0e93a76e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/ConfigPhysicalToolService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/ConfigPhysicalToolService.java @@ -2,6 +2,9 @@ package com.supervision.service; import com.supervision.model.ConfigPhysicalTool; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; + +import java.util.List; /** * @author flevance @@ -10,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ConfigPhysicalToolService extends IService { + List queryPhysicalToolList(); + } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java index e907a462..2ceff817 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java @@ -9,6 +9,7 @@ import com.supervision.mapper.ConfigAncillaryItemMapper; import com.supervision.service.DiagnosisAncillaryRecordService; import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.AskAncillaryHistoryResVO; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.vo.result.ConfigAncillaryItemVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -53,6 +54,18 @@ public class ConfigAncillaryItemServiceImpl extends ServiceImpl queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { + + List list = this.queryVoList(ancillaryItemReqVo); + return list.stream().collect(Collectors.groupingBy(ConfigAncillaryItem::getType)).entrySet().stream().map(e -> { + ConfigAncillaryItemResVO item = new ConfigAncillaryItemResVO(); + item.setItemName(e.getKey()); + item.setItemList(e.getValue()); + return item; + }).collect(Collectors.toList()); + } + private List findByKeyWord(String keyWord){ keyWord = StrUtil.trim(keyWord); return super.lambdaQuery().like(StrUtil.isNotEmpty(keyWord), ConfigAncillaryItem::getItemName, keyWord) diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigPhysicalToolServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigPhysicalToolServiceImpl.java index a5c6634e..4fbf2810 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigPhysicalToolServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigPhysicalToolServiceImpl.java @@ -1,11 +1,17 @@ package com.supervision.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.model.ConfigPhysicalTool; import com.supervision.service.ConfigPhysicalToolService; import com.supervision.mapper.ConfigPhysicalToolMapper; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; import org.springframework.stereotype.Service; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + /** * @author flevance * @description 针对表【vp_config_physical_tool(体格检查工具配置表)】的数据库操作Service实现 @@ -15,6 +21,22 @@ import org.springframework.stereotype.Service; public class ConfigPhysicalToolServiceImpl extends ServiceImpl implements ConfigPhysicalToolService{ + @Override + public List queryPhysicalToolList() { + + List list = this.lambdaQuery().list(); + return list.stream().collect(Collectors.groupingBy(ConfigPhysicalTool::getType)).entrySet().stream().map(e ->{ + ConfigPhysicalToolResVO tool = new ConfigPhysicalToolResVO(); + tool.setToolType(e.getKey()); + int priority = 999; + if (CollectionUtil.isNotEmpty(e.getValue()) && null != e.getValue().get(0).getTypePriority()) { + priority = e.getValue().get(0).getTypePriority(); + } + tool.setPriority(priority); + tool.setToolList(e.getValue()); + return tool; + }).sorted(Comparator.comparingInt(ConfigPhysicalToolResVO::getPriority)).collect(Collectors.toList()); + } } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigAncillaryItemResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java similarity index 87% rename from virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigAncillaryItemResVO.java rename to virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java index e151264d..5990cc7f 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigAncillaryItemResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java @@ -1,4 +1,4 @@ -package com.supervision.pojo.vo; +package com.supervision.vo.ask; import com.supervision.vo.result.ConfigAncillaryItemVo; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigPhysicalToolResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigPhysicalToolResVO.java similarity index 90% rename from virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigPhysicalToolResVO.java rename to virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigPhysicalToolResVO.java index c3245e11..4e4c1ccc 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigPhysicalToolResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigPhysicalToolResVO.java @@ -1,4 +1,4 @@ -package com.supervision.pojo.vo; +package com.supervision.vo.ask; import com.supervision.model.ConfigPhysicalTool; import lombok.Data; diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java index 8d1ae7da..fb3d5fe3 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java @@ -3,7 +3,7 @@ package com.supervision.controller; import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.AskAncillaryHistoryResVO; import com.supervision.pojo.vo.AskAncillaryResultReqVO; -import com.supervision.pojo.vo.ConfigAncillaryItemResVO; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.service.AskAncillaryService; import com.supervision.vo.ask.DiagnosisAncillaryRecordVo; import io.swagger.annotations.Api; diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java index dc1fef9f..eccefefa 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java @@ -1,7 +1,7 @@ package com.supervision.controller; import com.supervision.pojo.vo.AskPhysicalResultReqVO; -import com.supervision.pojo.vo.ConfigPhysicalToolResVO; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; import com.supervision.service.AskPhysicalService; import com.supervision.vo.ask.DiagnosisPhysicalRecordVo; import com.supervision.vo.ask.AskPhysicalHistoryResVO; diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java index 7992b99a..b79eee05 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java @@ -3,7 +3,7 @@ package com.supervision.service; import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.AskAncillaryHistoryResVO; import com.supervision.pojo.vo.AskAncillaryResultReqVO; -import com.supervision.pojo.vo.ConfigAncillaryItemResVO; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.vo.ask.DiagnosisAncillaryRecordVo; import java.util.List; diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java index 402afb5a..8e79f2ae 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java @@ -1,7 +1,7 @@ package com.supervision.service; import com.supervision.pojo.vo.AskPhysicalResultReqVO; -import com.supervision.pojo.vo.ConfigPhysicalToolResVO; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; import com.supervision.vo.ask.DiagnosisPhysicalRecordVo; import com.supervision.vo.ask.AskPhysicalHistoryResVO; diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java index 7faa653f..e96ea44a 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java @@ -2,13 +2,12 @@ package com.supervision.service.impl; import com.supervision.dto.DiseaseAncillaryDto; import com.supervision.exception.BusinessException; -import com.supervision.mapper.DiseaseAncillaryMapper; import com.supervision.model.*; import com.supervision.model.Process; import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.AskAncillaryHistoryResVO; import com.supervision.pojo.vo.AskAncillaryResultReqVO; -import com.supervision.pojo.vo.ConfigAncillaryItemResVO; +import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.service.*; import com.supervision.util.UserUtil; import com.supervision.vo.ask.DiagnosisAncillaryRecordVo; @@ -38,13 +37,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService { @Override public List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { - List list = ancillaryItemService.queryVoList(ancillaryItemReqVo); - return list.stream().collect(Collectors.groupingBy(ConfigAncillaryItem::getType)).entrySet().stream().map(e -> { - ConfigAncillaryItemResVO item = new ConfigAncillaryItemResVO(); - item.setItemName(e.getKey()); - item.setItemList(e.getValue()); - return item; - }).collect(Collectors.toList()); + return ancillaryItemService.queryAncillaryItemList(ancillaryItemReqVo); } @Override diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java index d3550ff4..3e997883 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java @@ -6,7 +6,7 @@ import com.supervision.exception.BusinessException; import com.supervision.model.*; import com.supervision.model.Process; import com.supervision.pojo.vo.AskPhysicalResultReqVO; -import com.supervision.pojo.vo.ConfigPhysicalToolResVO; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; import com.supervision.service.*; import com.supervision.util.UserUtil; import com.supervision.vo.ask.DiagnosisPhysicalRecordVo; @@ -39,18 +39,7 @@ public class AskPhysicalServiceImpl implements AskPhysicalService { @Override public List queryPhysicalToolList() { - List list = toolService.lambdaQuery().list(); - return list.stream().collect(Collectors.groupingBy(ConfigPhysicalTool::getType)).entrySet().stream().map(e ->{ - ConfigPhysicalToolResVO tool = new ConfigPhysicalToolResVO(); - tool.setToolType(e.getKey()); - int priority = 999; - if (CollectionUtil.isNotEmpty(e.getValue()) && null != e.getValue().get(0).getTypePriority()) { - priority = e.getValue().get(0).getTypePriority(); - } - tool.setPriority(priority); - tool.setToolList(e.getValue()); - return tool; - }).sorted(Comparator.comparingInt(ConfigPhysicalToolResVO::getPriority)).collect(Collectors.toList()); + return toolService.queryPhysicalToolList(); } @Override