诊断依据bug处理

knowledgeman-service/src/main/java/com/diagbot/util/DiagnoseTypeConvertUtil.java

@@ -41,7 +41,6 @@ public class DiagnoseTypeConvertUtil {
                     res.add(LexiconTypeEnum.LIS_DETAILS.getKey());
                 } else if (DiagnoseFieldEnum.result.getKey() == field){
                     res.add(LexiconTypeEnum.LIS_RESULTS.getKey());
-                    res.add(LexiconTypeEnum.OTHER_DIAGNOSTIC_CRITERIA.getKey());
                 }
                 break;
             case Pacs: // 辅检标准词 -> 辅检项目
@@ -50,7 +49,6 @@ public class DiagnoseTypeConvertUtil {
                     res.add(LexiconTypeEnum.PACS_ITEMS.getKey());
                 } else if (DiagnoseFieldEnum.relation.getKey() == field){
                     res.add(LexiconTypeEnum.PACS_RESULTS.getKey());
-                    res.add(LexiconTypeEnum.OTHER_DIAGNOSTIC_CRITERIA.getKey());
                 }
                 break;
             case Antidiastole: // 鉴别诊断 -> 诊断

knowledgeman-service/src/main/java/com/diagbot/util/VerifyUtil.java

@@ -33,10 +33,11 @@ public class VerifyUtil {
 
 
     public static void main(String[] args) {
-    	String str = "1.99";
-		System.out.println(verifyCode("1", str));
-
-    	List<String> code = new ArrayList<>();
+		System.out.println(verifyStartEnd("1.1+1.2"));
+//    	String str = "1.99";
+//		System.out.println(verifyCode("1", str));
+//
+//    	List<String> code = new ArrayList<>();
 //    	code.add("拟诊");
 //    	code.add("1.1");
 //		System.out.println(verifyFormula(code, str));
@@ -223,7 +224,7 @@ public class VerifyUtil {
 	 */
 	public static boolean verifyStartEnd(String s) {
 		String startRegex =
-				".*(\\)|\\+|/)" ;
+				"(\\)|\\+|/).*" ;
 		String endRegex =
 				".*(\\(|\\)|\\+|/)" ;
 		if (Pattern.matches(startRegex, s)) {