|
|
@@ -50,6 +50,7 @@ import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.ConceptCommonService;
|
|
|
import com.diagbot.service.ConceptService;
|
|
|
+import com.diagbot.service.DiseaseService;
|
|
|
import com.diagbot.service.LibraryInfoService;
|
|
|
import com.diagbot.service.impl.ConceptServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
@@ -108,6 +109,9 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
private ConceptCommonFacade conceptCommonFacade;
|
|
|
@Autowired
|
|
|
private DiseaseFacade diseaseFacade;
|
|
|
+ @Autowired
|
|
|
+ @Qualifier("diseaseServiceImpl")
|
|
|
+ private DiseaseService diseaseService;
|
|
|
|
|
|
/**
|
|
|
* 获取所有化验公表项
|
|
|
@@ -1032,6 +1036,31 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
if(ListUtil.isNotEmpty(saveOrUpdateConceptCommonList)){
|
|
|
conceptCommonService.saveOrUpdateBatch(saveOrUpdateConceptCommonList);
|
|
|
}
|
|
|
+
|
|
|
+ List<AddConceptInfoVO> disExtConList = addConceptInfoVOList.stream().filter(i->i.getConceptId()==null&&i.getType().equals(LexiconTypeEnum.DIAGNOSIS.getName())).collect(Collectors.toList());
|
|
|
+ if(ListUtil.isNotEmpty(disExtConList)){
|
|
|
+ String currentUser = UserUtils.getCurrentPrincipleID();
|
|
|
+ Date now = DateUtil.now();
|
|
|
+
|
|
|
+ QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
|
|
|
+ conceptQe.eq("lib_name", "全科");
|
|
|
+ conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
|
|
|
+ Concept deptConcept = getOne(conceptQe);
|
|
|
+
|
|
|
+ List<Disease> saveDiseaseList = Lists.newArrayList();
|
|
|
+ disExtConList.forEach(i->{
|
|
|
+ Disease disease = new Disease();
|
|
|
+ disease.setGmtCreate(now);
|
|
|
+ disease.setCreator(currentUser);
|
|
|
+ disease.setGmtModified(now);
|
|
|
+ disease.setModifier(currentUser);
|
|
|
+ disease.setConceptId(i.getConcept().getId());
|
|
|
+ disease.setDeptId(deptConcept.getId());
|
|
|
+ disease.setClassify("Ⅰ");
|
|
|
+ saveDiseaseList.add(disease);
|
|
|
+ });
|
|
|
+ diseaseService.saveBatch(saveDiseaseList);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@SuppressWarnings("deprecation")
|
rgb