静态知识维护

src/main/java/com/diagbot/facade/ConceptInfoFacade.java

@@ -541,28 +541,31 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         //术语类型转换
         String typeName = convertTypeName(ConceptTypeEnum.getName(Integer.valueOf(conceptInfoVO.getType())), 1, dicList);
         conceptInfoVO.setTypeName(typeName);
+        ConceptInfo conceptInfo = new ConceptInfo();
         if (conceptInfoVO.getId() == null) {
             QueryWrapper<ConceptInfo> conceptInfoQueryWrapper = new QueryWrapper<>();
             conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("name", conceptInfoVO.getName())
                     .eq("type", typeName);
-            ConceptInfo conceptInfo = this.getOne(conceptInfoQueryWrapper, false);
+            conceptInfo = this.getOne(conceptInfoQueryWrapper, false);
             //术语不存在，保存术语信息
             if (conceptInfo == null) {
                 conceptInfo = new ConceptInfo();
-                BeanUtil.copyProperties(conceptInfoVO, conceptInfo);
-                conceptInfo.setType(typeName);
                 conceptInfo.setCreator(userId);
                 conceptInfo.setGmtCreate(now);
-                conceptInfo.setModifier(userId);
-                conceptInfo.setGmtModified(now);
-                this.save(conceptInfo);
             }
-            conceptInfoVO.setId(conceptInfo.getId());
         }
+        conceptInfo.setName(conceptInfoVO.getName());
+        conceptInfo.setClinicalPathwayName(conceptInfoVO.getClinicalPathwayName());
+        conceptInfo.setNoticeName(conceptInfoVO.getNoticeName());
+        conceptInfo.setType(typeName);
+        conceptInfo.setModifier(userId);
+        conceptInfo.setGmtModified(now);
+        this.saveOrUpdate(conceptInfo);
+        conceptInfoVO.setId(conceptInfo.getId());
         //是否包含静态信息，包含启用和禁用
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
-        conceptDetailQueryWrapper.eq("concept_id", conceptInfoVO.getId());
+        conceptDetailQueryWrapper.eq("concept_id",conceptInfo.getId());
         List<ConceptDetail> oldDetails = conceptDetailFacade.list(conceptDetailQueryWrapper);
         if (ListUtil.isEmpty(oldDetails)
                 && ListUtil.isNotEmpty(conceptInfoVO.getDetails())) {