Yaxin
/
virtual-patient
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manage：代码结构调整

Browse Source
dev_2.0.0
xueqingkun 1 year ago
parent 949386e11c
commit b718b5e35b
18 changed files with 173 additions and 28 deletions
Show Stats Download Patch File Download Diff File

28
virtual-patient-manage/src/main/java/com/supervision/manage/controller/AncillaryItemManageController.java
Unescape Escape View File

@ -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<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
return ancillaryItemManageService.queryAncillaryItemList(ancillaryItemReqVo);
}
}

28
virtual-patient-manage/src/main/java/com/supervision/manage/controller/PhysicalToolManageController.java
Unescape Escape View File

@ -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<ConfigPhysicalToolResVO> queryPhysicalToolList() {
return physicalToolManageService.queryPhysicalToolList();
}
}

11
virtual-patient-manage/src/main/java/com/supervision/manage/service/AncillaryItemManageService.java
Unescape Escape View File

@ -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<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo);
}

10
virtual-patient-manage/src/main/java/com/supervision/manage/service/PhysicalToolManageService.java
Unescape Escape View File

@ -0,0 +1,10 @@
package com.supervision.manage.service;
import com.supervision.vo.ask.ConfigPhysicalToolResVO;
import java.util.List;
public interface PhysicalToolManageService {
List<ConfigPhysicalToolResVO> queryPhysicalToolList();
}

21
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java
Unescape Escape View File

@ -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<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
return configAncillaryItemService.queryAncillaryItemList(ancillaryItemReqVo);
}
}

22
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java
Unescape Escape View File

@ -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<ConfigPhysicalToolResVO> queryPhysicalToolList() {
return configPhysicalToolService.queryPhysicalToolList();
}
}

3
virtual-patient-model/src/main/java/com/supervision/service/ConfigAncillaryItemService.java
Unescape Escape View File

@ -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<ConfigAncillaryItem
List<ConfigAncillaryItemVo> queryVoList(AncillaryItemReqVo ancillaryItemReqVo);
List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo);
}

5
virtual-patient-model/src/main/java/com/supervision/service/ConfigPhysicalToolService.java
Unescape Escape View File

@ -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<ConfigPhysicalTool> {
List<ConfigPhysicalToolResVO> queryPhysicalToolList();
}

13
virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java
Unescape Escape View File

@ -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<ConfigAncillaryI
}
@Override
public List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
List<ConfigAncillaryItemVo> 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<ConfigAncillaryItem> findByKeyWord(String keyWord){
keyWord = StrUtil.trim(keyWord);
return super.lambdaQuery().like(StrUtil.isNotEmpty(keyWord), ConfigAncillaryItem::getItemName, keyWord)

22
virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigPhysicalToolServiceImpl.java
Unescape Escape View File

@ -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<ConfigPhysicalToolMapper, ConfigPhysicalTool>
implements ConfigPhysicalToolService{
@Override
public List<ConfigPhysicalToolResVO> queryPhysicalToolList() {
List<ConfigPhysicalTool> 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());
}
}

2
virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigAncillaryItemResVO.java → virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.supervision.pojo.vo;
package com.supervision.vo.ask;
import com.supervision.vo.result.ConfigAncillaryItemVo;
import lombok.Data;

2
virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigPhysicalToolResVO.java → virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigPhysicalToolResVO.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.supervision.pojo.vo;
package com.supervision.vo.ask;
import com.supervision.model.ConfigPhysicalTool;
import lombok.Data;

2
virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java
Unescape Escape View File

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

2
virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java
Unescape Escape View File

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

2
virtual-patient-web/src/main/java/com/supervision/service/AskAncillaryService.java
Unescape Escape View File

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

2
virtual-patient-web/src/main/java/com/supervision/service/AskPhysicalService.java
Unescape Escape View File

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

11
virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
Unescape Escape View File

@ -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<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
List<ConfigAncillaryItemVo> 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

15
virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java
Unescape Escape View File

@ -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<ConfigPhysicalToolResVO> queryPhysicalToolList() {
List<ConfigPhysicalTool> 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

Write Preview
Loading…
Cancel
Save