术语命名维护修改-编辑

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -253,7 +253,6 @@ public class ConceptFacade extends ConceptServiceImpl {
     
     /**
      * 医学术语命名添加或者编辑
-     * 说明：1、不允许单个非标准术语添加
      * 
      * @param addConceptInfoVO
      * @return
@@ -310,13 +309,15 @@ public class ConceptFacade extends ConceptServiceImpl {
 			libraryInfoMain.setModifier(currentUser);
 			libraryInfoMain.setType(addConceptInfoVO.getType());
 			libraryInfoMain.setTypeId(lexicon.getId());
+			libraryInfoMain.setConceptId(addConceptInfoVO.getConceptId());
 			libraryinfoFacade.save(libraryInfoMain);
 			concept.setLibId(libraryInfoMain.getId());
 			concept.setGmtCreated(now);
 			concept.setCreator(currentUser);
 			concept.setGmtModified(now);
 			concept.setModifier(currentUser);
-			save(concept);
+			concept.setId(addConceptInfoVO.getConceptId());
+			saveOrUpdate(concept);
 			conceptId = concept.getId();
 			libraryInfoMain.setConceptId(conceptId);
     	}else{

knowledgeman-service/src/main/java/com/diagbot/vo/AddConceptInfoVO.java

@@ -18,6 +18,12 @@ import lombok.Setter;
 @Setter
 public class AddConceptInfoVO {
 	
+	/**
+     * 概念id,当不为空时，即编辑操作
+     */
+	@ApiModelProperty(value="概念id")
+    private Long conceptId;
+	
 	/**
      * 标准术语名称 提示使用
      */