|
@@ -249,7 +249,24 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
|
|
}
|
|
}
|
|
|
|
|
|
List<CasesNumber> casesNumbers = casesNumberService.list(casesNumberQueryWrapper);
|
|
List<CasesNumber> casesNumbers = casesNumberService.list(casesNumberQueryWrapper);
|
|
|
|
+ //将病例内容放入出参
|
|
List<QcAllInputcasesDTO> res = new ArrayList<>();
|
|
List<QcAllInputcasesDTO> res = new ArrayList<>();
|
|
|
|
+ res = BeanUtil.listCopyTo(casesNumbers,QcAllInputcasesDTO.class);
|
|
|
|
+ return res;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public List<QcAllInputcasesDTO> getInputcasesDetial(QcInputcasesAllVO qcInputcasesAllVO){
|
|
|
|
+ //病例
|
|
|
|
+ QueryWrapper<CasesNumber> casesNumberQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ casesNumberQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
|
|
|
|
+ .orderByAsc("id");
|
|
|
|
+ if(StringUtil.isNotEmpty(qcInputcasesAllVO.getCaseNumber())){
|
|
|
|
+ casesNumberQueryWrapper.like("case_number",qcInputcasesAllVO.getCaseNumber());
|
|
|
|
+ }
|
|
|
|
+ List<CasesNumber> casesNumbers = casesNumberService.list(casesNumberQueryWrapper);
|
|
|
|
+ //将病例内容放入出参
|
|
|
|
+ List<QcAllInputcasesDTO> res = new ArrayList<>();
|
|
|
|
+ res = BeanUtil.listCopyTo(casesNumbers,QcAllInputcasesDTO.class);
|
|
//病例内容
|
|
//病例内容
|
|
QueryWrapper<ModelMapping> modelMappingQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<ModelMapping> modelMappingQueryWrapper = new QueryWrapper<>();
|
|
modelMappingQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
|
|
modelMappingQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
|
|
@@ -260,18 +277,13 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
|
|
QueryWrapper<Mode> modelQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<Mode> modelQueryWrapper = new QueryWrapper<>();
|
|
modelQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
|
|
modelQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
|
|
List<Mode> modes = modeService.list();
|
|
List<Mode> modes = modeService.list();
|
|
- Map<Long,String> modeMap = new HashMap<>();
|
|
|
|
- modeMap = modes.stream().collect(Collectors.toMap(Mode::getId,mode -> mode.getName()));
|
|
|
|
//病例列表
|
|
//病例列表
|
|
QueryWrapper<QcHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<QcHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
|
|
hospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
|
|
hospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
|
|
List<QcHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
|
|
List<QcHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
|
|
Map<Long,String> hospitalMap = new HashMap<>();
|
|
Map<Long,String> hospitalMap = new HashMap<>();
|
|
hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(QcHospitalInfo::getId,hospitalInfo -> hospitalInfo.getName()));
|
|
hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(QcHospitalInfo::getId,hospitalInfo -> hospitalInfo.getName()));
|
|
- //将病例内容放入出参
|
|
|
|
- res = BeanUtil.listCopyTo(casesNumbers,QcAllInputcasesDTO.class);
|
|
|
|
List<ModuleMappingDTO> moduleMappingDTOS = new ArrayList<>();
|
|
List<ModuleMappingDTO> moduleMappingDTOS = new ArrayList<>();
|
|
- List<Long> modIds = new ArrayList<>();
|
|
|
|
ModuleMappingDTO moduleMappingDTO = new ModuleMappingDTO();
|
|
ModuleMappingDTO moduleMappingDTO = new ModuleMappingDTO();
|
|
List<String> modeList = new ArrayList();
|
|
List<String> modeList = new ArrayList();
|
|
for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
|
|
for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
|
|
@@ -294,23 +306,6 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
|
|
qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
|
|
qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
|
|
qcAllInputcasesDTO.setModuleMappingDTOList(moduleMappingDTOS);
|
|
qcAllInputcasesDTO.setModuleMappingDTOList(moduleMappingDTOS);
|
|
}
|
|
}
|
|
- /* for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
|
|
|
|
- for (ModelMapping modelMapping : modelMappings) {
|
|
|
|
- if (qcAllInputcasesDTO.getId().intValue() == modelMapping.getCaseNumberId().intValue()){
|
|
|
|
- if(!modIds.contains(modelMapping.getModeId())){
|
|
|
|
- moduleMappingDTO = new ModuleMappingDTO();
|
|
|
|
- moduleMappingDTO.setModeId(modelMapping.getModeId());
|
|
|
|
- moduleMappingDTO.setName(modeMap.get(modelMapping.getModeId()));
|
|
|
|
- moduleMappingDTO.setText(modelMapping.getText());
|
|
|
|
- moduleMappingDTOS.add(moduleMappingDTO);
|
|
|
|
- modIds.add(modelMapping.getModeId());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
|
|
|
|
- qcAllInputcasesDTO.setModuleMappingDTOList(moduleMappingDTOS);
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
// 查出所有病例病例类型
|
|
// 查出所有病例病例类型
|
|
List<QcInputcasesMappingDTO> qcInputcasesMapping = qcInputcasesMappingService.getInputMapping(qcInputcasesAllVO.getCaseNumber());
|
|
List<QcInputcasesMappingDTO> qcInputcasesMapping = qcInputcasesMappingService.getInputMapping(qcInputcasesAllVO.getCaseNumber());
|
|
// 然后把所有病例类型放进去
|
|
// 然后把所有病例类型放进去
|
|
@@ -324,8 +319,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- return res;
|
|
|
|
|
|
+ return res;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|