|
@@ -161,12 +161,17 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("concept_id", sameConcept.getId())
|
|
|
.eq("status", StatusEnum.Enable.getKey()), false);
|
|
|
- BeanUtil.copyProperties(sameConcept, concept);
|
|
|
- staticKnowledgeVO.setType(sameType);
|
|
|
if (staticInfo != null) {
|
|
|
//存在同名的项,替换原来的项
|
|
|
- //BeanUtil.copyProperties(sameConcept, concept);
|
|
|
- //staticKnowledgeVO.setType(sameType);
|
|
|
+ BeanUtil.copyProperties(sameConcept, concept);
|
|
|
+ staticKnowledgeVO.setType(sameType);
|
|
|
+ } else {
|
|
|
+ //存在同名细项
|
|
|
+ if (sameType.equals(LexiconEnum.LisSubName.getKey())
|
|
|
+ || sameType.equals(LexiconEnum.PacsSubName.getKey())) {
|
|
|
+ BeanUtil.copyProperties(sameConcept, concept);
|
|
|
+ staticKnowledgeVO.setType(sameType);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|