|
@@ -448,7 +448,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
if (lexicon.getIsHasCommon() == 1) {
|
|
if (lexicon.getIsHasCommon() == 1) {
|
|
QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
|
|
QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
|
|
conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
|
|
conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
|
|
- ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
|
|
|
|
|
|
+ ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe, false);
|
|
if (conceptCommon != null) {
|
|
if (conceptCommon != null) {
|
|
getConceptInfoDTO.setSexType(conceptCommon.getSexType());
|
|
getConceptInfoDTO.setSexType(conceptCommon.getSexType());
|
|
getConceptInfoDTO.setMinAge(conceptCommon.getMinAge());
|
|
getConceptInfoDTO.setMinAge(conceptCommon.getMinAge());
|
|
@@ -459,7 +459,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
if(LexiconTypeEnum.DIAGNOSIS.getKey()==concept.getLibType().intValue()){
|
|
if(LexiconTypeEnum.DIAGNOSIS.getKey()==concept.getLibType().intValue()){
|
|
QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
|
|
QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
|
|
diseaseQe.eq("concept_id", concept.getId());
|
|
diseaseQe.eq("concept_id", concept.getId());
|
|
- Disease disease = diseaseFacade.getOne(diseaseQe);
|
|
|
|
|
|
+ Disease disease = diseaseFacade.getOne(diseaseQe, false);
|
|
if(disease!=null){
|
|
if(disease!=null){
|
|
getConceptInfoDTO.setDeptId(disease.getDeptId());
|
|
getConceptInfoDTO.setDeptId(disease.getDeptId());
|
|
getConceptInfoDTO.setClassify(disease.getClassify());
|
|
getConceptInfoDTO.setClassify(disease.getClassify());
|
|
@@ -508,7 +508,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
|
|
|
QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
|
|
QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
|
|
lexiconQe.eq("name", addConceptInfoVO.getType());
|
|
lexiconQe.eq("name", addConceptInfoVO.getType());
|
|
- Lexicon lexicon = lexiconFacade.getOne(lexiconQe);
|
|
|
|
|
|
+ Lexicon lexicon = lexiconFacade.getOne(lexiconQe, false);
|
|
if (lexicon == null) {
|
|
if (lexicon == null) {
|
|
throw new CommonException(CommonErrorCode.NOT_EXISTS, lineNumStr + "数据有误,该类型信息在数据库中不存在!");
|
|
throw new CommonException(CommonErrorCode.NOT_EXISTS, lineNumStr + "数据有误,该类型信息在数据库中不存在!");
|
|
}
|
|
}
|
|
@@ -632,7 +632,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
if (lexicon.getIsHasCommon() == 1) {
|
|
if (lexicon.getIsHasCommon() == 1) {
|
|
QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
|
|
QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
|
|
conceptCommonQe.eq("concept_id", conceptId);
|
|
conceptCommonQe.eq("concept_id", conceptId);
|
|
- ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
|
|
|
|
|
|
+ ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe, false);
|
|
if (conceptCommon == null) {
|
|
if (conceptCommon == null) {
|
|
conceptCommon = new ConceptCommon();
|
|
conceptCommon = new ConceptCommon();
|
|
conceptCommon.setGmtCreate(now);
|
|
conceptCommon.setGmtCreate(now);
|
|
@@ -650,7 +650,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
if(lexicon.getName().equals(LexiconTypeEnum.DIAGNOSIS.getName())){
|
|
if(lexicon.getName().equals(LexiconTypeEnum.DIAGNOSIS.getName())){
|
|
QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
|
|
QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
|
|
diseaseQe.eq("concept_id", conceptId);
|
|
diseaseQe.eq("concept_id", conceptId);
|
|
- Disease disease = diseaseFacade.getOne(diseaseQe);
|
|
|
|
|
|
+ Disease disease = diseaseFacade.getOne(diseaseQe, false);
|
|
if(disease==null){
|
|
if(disease==null){
|
|
disease = new Disease();
|
|
disease = new Disease();
|
|
disease.setGmtCreate(now);
|
|
disease.setGmtCreate(now);
|
|
@@ -664,7 +664,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
|
|
QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
|
|
conceptQe.eq("lib_name", "全科");
|
|
conceptQe.eq("lib_name", "全科");
|
|
conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
|
|
conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
|
|
- disease.setDeptId(getOne(conceptQe).getId());
|
|
|
|
|
|
+ disease.setDeptId(getOne(conceptQe, false).getId());
|
|
disease.setClassify(DiseaseClassifyEnum.LevelFirst.getName());
|
|
disease.setClassify(DiseaseClassifyEnum.LevelFirst.getName());
|
|
}else{
|
|
}else{
|
|
BeanUtil.copyProperties(addConceptInfoVO.getAddCptDiseaseExtVO(), disease);
|
|
BeanUtil.copyProperties(addConceptInfoVO.getAddCptDiseaseExtVO(), disease);
|
|
@@ -1086,7 +1086,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
|
|
QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
|
|
conceptQe.eq("lib_name", "全科");
|
|
conceptQe.eq("lib_name", "全科");
|
|
conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
|
|
conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
|
|
- Concept deptConcept = getOne(conceptQe);
|
|
|
|
|
|
+ Concept deptConcept = getOne(conceptQe, false);
|
|
|
|
|
|
List<Disease> saveDiseaseList = Lists.newArrayList();
|
|
List<Disease> saveDiseaseList = Lists.newArrayList();
|
|
disExtConList.forEach(i->{
|
|
disExtConList.forEach(i->{
|