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

web : 1.修改 查询辅助检查项目列表 接口

Browse Source
release_1.0.0
xueqingkun 1 year ago
parent 9a41b5abf5
commit f8a361851d
8 changed files with 113 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -2,6 +2,10 @@ 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.result.ConfigAncillaryItemVo;
import java.util.List;
/**
* @author flevance
@ -10,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ConfigAncillaryItemService extends IService<ConfigAncillaryItem> {
List<ConfigAncillaryItemVo> queryVoList(AncillaryItemReqVo ancillaryItemReqVo);
}

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

@ -1,20 +1,62 @@
package com.supervision.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.supervision.model.ConfigAncillaryItem;
import com.supervision.service.ConfigAncillaryItemService;
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.result.ConfigAncillaryItemVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* @author flevance
* @description 针对表【vp_config_ancillary_item(辅助检查项目配置表)】的数据库操作Service实现
* @createDate 2023-10-20 17:19:21
*/
@Service
@RequiredArgsConstructor
public class ConfigAncillaryItemServiceImpl extends ServiceImpl<ConfigAncillaryItemMapper, ConfigAncillaryItem>
implements ConfigAncillaryItemService{
private final DiagnosisAncillaryRecordService diagnosisAncillaryRecordService;
@Override
public List<ConfigAncillaryItemVo> queryVoList(AncillaryItemReqVo ancillaryItemReqVo) {
List<ConfigAncillaryItem> configAncillaryItems = findByKeyWord(ancillaryItemReqVo.getKeyWord());
if (CollUtil.isEmpty(configAncillaryItems)){
return CollUtil.newArrayList();
}
final Set<String> recordItemIds = new HashSet<>();
if (StrUtil.isNotEmpty(ancillaryItemReqVo.getProcessId())){
List<AskAncillaryHistoryResVO> askAncillaryHistoryResVOS = diagnosisAncillaryRecordService.queryAncillaryRecord(ancillaryItemReqVo.getProcessId());
recordItemIds.addAll(askAncillaryHistoryResVOS.stream().map(AskAncillaryHistoryResVO::getItemId).collect(Collectors.toSet()));
}
return configAncillaryItems.stream().map(e->{
ConfigAncillaryItemVo itemVo = new ConfigAncillaryItemVo(e);
itemVo.setExecStatus(recordItemIds.contains(itemVo.getId()) ? 1 : 0 );
return itemVo;
}).collect(Collectors.toList());
}
private List<ConfigAncillaryItem> findByKeyWord(String keyWord){
return super.lambdaQuery().like(StrUtil.isNotEmpty(keyWord), ConfigAncillaryItem::getItemName, keyWord)
.or().like(StrUtil.isNotEmpty(keyWord), ConfigAncillaryItem::getType, keyWord).list();
}
}

16
virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java
Unescape Escape View File

@ -0,0 +1,16 @@
package com.supervision.vo.ask;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AncillaryItemReqVo {
@ApiModelProperty("流程id")
private String processId;
@ApiModelProperty("搜索关键子")
private String keyWord;
}

37
virtual-patient-model/src/main/java/com/supervision/vo/result/ConfigAncillaryItemVo.java
Unescape Escape View File

@ -0,0 +1,37 @@
package com.supervision.vo.result;
import com.supervision.model.ConfigAncillaryItem;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class ConfigAncillaryItemVo extends ConfigAncillaryItem {
@ApiModelProperty("执行状态; 0: 未检查 1: 已检查")
private Integer execStatus;
public ConfigAncillaryItemVo() {
}
public ConfigAncillaryItemVo(Integer execStatus) {
this.execStatus = execStatus;
}
public ConfigAncillaryItemVo(ConfigAncillaryItem configAncillaryItem){
super.setId(configAncillaryItem.getId());
super.setType(configAncillaryItem.getType());
super.setCode(configAncillaryItem.getCode());
super.setItemClass(configAncillaryItem.getItemClass());
super.setItemName(configAncillaryItem.getItemName());
super.setInfo(configAncillaryItem.getInfo());
super.setCallOutQuestion(configAncillaryItem.getCallOutQuestion());
super.setCreateTime(configAncillaryItem.getCreateTime());
super.setCreateUserId(configAncillaryItem.getCreateUserId());
super.setUpdateTime(configAncillaryItem.getUpdateTime());
super.setUpdateUserId(configAncillaryItem.getUpdateUserId());
}
}

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

@ -1,5 +1,6 @@
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;
@ -24,8 +25,8 @@ public class AskAncillaryController {
@ApiOperation("查询辅助检查项目列表")
@GetMapping("queryAncillaryItemList")
public List<ConfigAncillaryItemResVO> queryAncillaryItemList() {
return askAncillaryService.queryAncillaryItemList();
public List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
return askAncillaryService.queryAncillaryItemList(ancillaryItemReqVo);
}
@ApiOperation("进行辅助检查,并获取结果")

4
virtual-patient-web/src/main/java/com/supervision/pojo/vo/ConfigAncillaryItemResVO.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.supervision.pojo.vo;
import com.supervision.model.ConfigAncillaryItem;
import com.supervision.vo.result.ConfigAncillaryItemVo;
import lombok.Data;
import java.util.List;
@ -10,5 +10,5 @@ public class ConfigAncillaryItemResVO {
private String itemName;
private List<ConfigAncillaryItem> itemList;
private List<ConfigAncillaryItemVo> itemList;
}

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

@ -1,5 +1,6 @@
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;
@ -9,7 +10,7 @@ import java.util.List;
public interface AskAncillaryService {
List<ConfigAncillaryItemResVO> queryAncillaryItemList();
List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo);
DiagnosisAncillaryRecordVo execAskAncillaryResult(AskAncillaryResultReqVO reqVO);

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

@ -5,12 +5,14 @@ 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.service.*;
import com.supervision.util.UserUtil;
import com.supervision.vo.ask.DiagnosisAncillaryRecordVo;
import com.supervision.vo.result.ConfigAncillaryItemVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@ -29,17 +31,11 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
private final DiagnosisAncillaryRecordService diagnosisAncillaryRecordService;
private final MedicalRecService medicalRecService;
private final DiseaseAncillaryMapper diseaseAncillaryMapper;
@Override
public List<ConfigAncillaryItemResVO> queryAncillaryItemList() {
DiseaseAncillary diseaseAncillary = new DiseaseAncillary();
diseaseAncillary.setMedicalRecId("1");
diseaseAncillary.setItemId("100");
List<DiseaseAncillaryDto> diseaseAncillaryDtos = diseaseAncillaryMapper.queryDiseaseAncillaryDtoList(diseaseAncillary);
List<ConfigAncillaryItem> list = ancillaryItemService.lambdaQuery().list();
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());

Write Preview
Loading…
Cancel
Save