术语类型修改

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

@@ -47,6 +47,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.LibraryInfoService;
 import com.diagbot.service.impl.ConceptServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.Cn2SpellUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.IntegerUtil;
@@ -312,6 +313,10 @@ public class ConceptFacade extends ConceptServiceImpl {
                 throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无法输入纯数字或者纯字符，请输入正确数据！");
             }
         }
+        
+        if(addConceptInfoVO.getMaxAge()<addConceptInfoVO.getMinAge()){
+        	throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "症状发生的最小年龄大于症状发生的最大年龄！");
+        }
 
         if (addConceptInfoVO.getDetailList().stream().distinct().count() != addConceptInfoVO.getDetailList().size()) {
             throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "存在重复数据！");
@@ -357,6 +362,8 @@ public class ConceptFacade extends ConceptServiceImpl {
             libraryInfoMain.setTypeId(lexicon.getId());
             libraryinfoFacade.save(libraryInfoMain);
             concept.setLibId(libraryInfoMain.getId());
+            concept.setLibName(addConceptInfoDetailVOMain.getName());
+            concept.setLibType(lexicon.getId());
             concept.setGmtCreate(now);
             concept.setCreator(currentUser);
             concept.setId(addConceptInfoVO.getConceptId());
@@ -404,10 +411,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                 continue;
             }
 
-            libraryInfo.setGmtModified(now);
-            libraryInfo.setModifier(currentUser);
             libraryInfo.setName(i.getName());
-            libraryInfo.setIsConcept(0);
             libraryInfo.setRemark(i.getRemark());
             saveOrUpdateLibraryInfoList.add(libraryInfo);
         }
@@ -419,11 +423,16 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         for (LibraryInfo i : saveOrUpdateLibraryInfoList) {
             i.setId(null);
+            i.setSpell(Cn2SpellUtil.converterToFirstSpell(i.getName()));
             i.setConceptId(conceptId);
             i.setTypeId(lexicon.getId());
+            i.setIsConcept(0);
+            i.setGmtModified(now);
+            i.setModifier(currentUser);
         }
         libraryInfoMain.setIsConcept(1);
         libraryInfoMain.setRemark(addConceptInfoDetailVOMain.getRemark());
+        libraryInfoMain.setSpell(Cn2SpellUtil.converterToFirstSpell(libraryInfoMain.getName()));
         libraryInfoMain.setConceptId(conceptId);
         libraryInfoMain.setGmtModified(now);
         libraryInfoMain.setModifier(currentUser);
@@ -433,6 +442,8 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         concept.setId(conceptId);
         concept.setLibId(libraryInfoMain.getId());
+        concept.setLibName(libraryInfoMain.getName());
+        concept.setLibType(libraryInfoMain.getTypeId());
         concept.setGmtModified(now);
         concept.setModifier(currentUser);
         updateById(concept);

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

@@ -5,6 +5,8 @@ import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
+import org.hibernate.validator.constraints.Range;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -49,19 +51,22 @@ public class AddConceptInfoVO {
      * 性别：1:男, 2:女, 3:通用
      */
 	@ApiModelProperty(value="性别：1:男, 2:女, 3:通用")
-    private Integer sexType = 3;
+	@Range(min=1,max=3,message="性别须是1-3")
+    private Integer sexType=3;
 
     /**
      * 症状发生的最小年龄
      */
 	@ApiModelProperty(value="症状发生的最小年龄")
-    private Integer minAge;
+	@Range(min=0,max=200,message="年龄须是0-200")
+    private Integer minAge=0;
 
     /**
      * 症状发生的最大年龄
      */
 	@ApiModelProperty(value="症状发生的最大年龄")
-    private Integer maxAge;
+	@Range(min=0,max=200,message="年龄须是0-200")
+    private Integer maxAge=200;
 	
 	private Integer lineNum;