|
|
|
@ -74,24 +74,24 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
|
|
|
|
|
List<DiagnosisPrimaryRelation> list = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getPrimaryId, reqVO.getId()).list();
|
|
|
|
|
Map<Integer, List<DiagnosisPrimaryRelation>> groupByTypeMap = list.stream().collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getType));
|
|
|
|
|
// 保存问诊
|
|
|
|
|
List<DiagnosisPrimaryRelation> askExistList = groupByTypeMap.get(1);
|
|
|
|
|
List<DiagnosisPrimaryRelation> askExistList = groupByTypeMap.getOrDefault(1, new ArrayList<>());
|
|
|
|
|
if (CollUtil.isNotEmpty(reqVO.getAskIdList())) {
|
|
|
|
|
List<String> existIdList = askExistList.stream().map(DiagnosisPrimaryRelation::getRelationId).collect(Collectors.toList());
|
|
|
|
|
List<String> newIdList = reqVO.getAskIdList().stream().filter(id ->!existIdList.contains(id)).collect(Collectors.toList());
|
|
|
|
|
List<String> newIdList = reqVO.getAskIdList().stream().filter(id -> !existIdList.contains(id)).collect(Collectors.toList());
|
|
|
|
|
saveDiagnosisPrimaryRelation(newIdList, diagnosisPrimary.getProcessId(), diagnosisPrimary.getId(), 1);
|
|
|
|
|
}
|
|
|
|
|
// 保存体格检查
|
|
|
|
|
List<DiagnosisPrimaryRelation> physicalIdExistList = groupByTypeMap.get(2);
|
|
|
|
|
List<DiagnosisPrimaryRelation> physicalIdExistList = groupByTypeMap.getOrDefault(2, new ArrayList<>());
|
|
|
|
|
if (CollUtil.isNotEmpty(reqVO.getPhysicalIdList())) {
|
|
|
|
|
List<String> existIdList = physicalIdExistList.stream().map(DiagnosisPrimaryRelation::getRelationId).collect(Collectors.toList());
|
|
|
|
|
List<String> newIdList = reqVO.getPhysicalIdList().stream().filter(id ->!existIdList.contains(id)).collect(Collectors.toList());
|
|
|
|
|
List<String> newIdList = reqVO.getPhysicalIdList().stream().filter(id -> !existIdList.contains(id)).collect(Collectors.toList());
|
|
|
|
|
saveDiagnosisPrimaryRelation(newIdList, diagnosisPrimary.getProcessId(), diagnosisPrimary.getId(), 2);
|
|
|
|
|
}
|
|
|
|
|
// 保存辅助检查
|
|
|
|
|
List<DiagnosisPrimaryRelation> ancillaryExistList = groupByTypeMap.get(3);
|
|
|
|
|
List<DiagnosisPrimaryRelation> ancillaryExistList = groupByTypeMap.getOrDefault(3, new ArrayList<>());
|
|
|
|
|
if (CollUtil.isNotEmpty(reqVO.getAncillaryIdList())) {
|
|
|
|
|
List<String> existIdList = ancillaryExistList.stream().map(DiagnosisPrimaryRelation::getRelationId).collect(Collectors.toList());
|
|
|
|
|
List<String> newIdList = reqVO.getAncillaryIdList().stream().filter(id ->!existIdList.contains(id)).collect(Collectors.toList());
|
|
|
|
|
List<String> newIdList = reqVO.getAncillaryIdList().stream().filter(id -> !existIdList.contains(id)).collect(Collectors.toList());
|
|
|
|
|
saveDiagnosisPrimaryRelation(newIdList, diagnosisPrimary.getProcessId(), diagnosisPrimary.getId(), 3);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|