解决关键词没设置导致的报错

docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java

@@ -80,13 +80,13 @@ public class OcrBasicTestDaoImpl extends BaseDaoImpl<OcrBasicTestMapper, OcrBasi
         PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<OcrBasicTest> query = Wrappers.lambdaQuery();
         //时间范围，默认按createTime
-        if (searchDTO.getBeginTime() != null) {
-            query.ge(OcrBasicTest::getCreateTime, searchDTO.getBeginTime());
-        }
-        if (searchDTO.getEndTime() != null) {
-            Date endTime = searchDTO.getEndTime();
-            query.le(OcrBasicTest::getCreateTime, endTime);
-        }
+//        if (searchDTO.getBeginTime() != null) {
+//            query.ge(OcrBasicTest::getCreateTime, searchDTO.getBeginTime());
+//        }
+//        if (searchDTO.getEndTime() != null) {
+//            Date endTime = searchDTO.getEndTime();
+//            query.le(OcrBasicTest::getCreateTime, endTime);
+//        }
         Object patientId = searchDTO.getParams("patientId");
         Object inpatientNo = searchDTO.getParams("inpatientNo");
         Object name = searchDTO.getParams("name");

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java

@@ -88,6 +88,9 @@ public class OcrRuleServiceImpl implements IOcrRuleService {
         List<OcrRule> ocrRules = iOcrRuleDao.findBy("version",version);
         //判断是否符合某个条件的开始条件
         for (OcrRule ocrRule : ocrRules) {
+            if (Func.isEmpty(ocrRule.getKeyWord())){
+                continue;
+            }
             String assortId = ocrRule.getAssortId();
             double score = ocrRule.getMatchRatio();
             String[] keyWordList = ocrRule.getKeyWord().split("#");
@@ -109,6 +112,9 @@ public class OcrRuleServiceImpl implements IOcrRuleService {
                                     assortId = ruleJson.getAssortId();
                                     List<OcrRuleSecondJson> ocrRuleSecondJsonList = ruleJson.getKeyWordList();
                                     for (OcrRuleSecondJson ocrRuleSecondJson:ocrRuleSecondJsonList) {
+                                        if (Func.isEmpty(ocrRuleSecondJson.getKeyWord())){
+                                            continue;
+                                        }
                                         keyWordList = ocrRuleSecondJson.getKeyWord().split("#");
                                         score = ocrRuleSecondJson.getMatchRatio();
                                         for (int j = 0; j < keyWordList.length; j++) {

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java

@@ -44,6 +44,9 @@ public class OcrRuleTestServiceImpl implements IOcrRuleTestService {
         for (OcrRuleTest ocrRuleTest : ocrRuleTestList) {
             String assortId = ocrRuleTest.getAssortId();
             double score = ocrRuleTest.getMatchRatio();
+            if (Func.isEmpty(ocrRuleTest.getKeyWord())){
+                continue;
+            }
             String[] keyWordList = ocrRuleTest.getKeyWord().split("#");
 
             for (String ocrText : ocrTextList) {
@@ -63,6 +66,9 @@ public class OcrRuleTestServiceImpl implements IOcrRuleTestService {
                                     assortId = ruleJson.getAssortId();
                                     List<OcrRuleSecondJson> ocrRuleSecondJsonList = ruleJson.getKeyWordList();
                                     for (OcrRuleSecondJson ocrRuleSecondJson : ocrRuleSecondJsonList) {
+                                        if (Func.isEmpty(ocrRuleSecondJson.getKeyWord())){
+                                            continue;
+                                        }
                                         keyWordList = ocrRuleSecondJson.getKeyWord().split("#");
                                         score = ocrRuleSecondJson.getMatchRatio();
                                         for (int j = 0; j < keyWordList.length; j++) {

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java

@@ -121,6 +121,9 @@ public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService {
 
             List<OcrSpecialRuleJson> ocrSpecialRuleJsons = Func.parseJsonArray(startJson, OcrSpecialRuleJson.class);
             for (OcrSpecialRuleJson ocrSpecialRuleJson : ocrSpecialRuleJsons) {
+                if (Func.isEmpty(ocrSpecialRuleJson.getKeyWord())){
+                    continue;
+                }
                 double score = ocrSpecialRuleJson.getScore();
                 String[] keyWordList = ocrSpecialRuleJson.getKeyWord().split("#");
                 for (String ocrText : ocrTextList) {

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java

@@ -51,6 +51,9 @@ public class OcrSpecialRuleTestServiceImpl implements IOcrSpecialRuleTestService
 
             List<OcrSpecialRuleJson> ocrSpecialRuleJsons = Func.parseJsonArray(startJson, OcrSpecialRuleJson.class);
             for (OcrSpecialRuleJson ocrSpecialRuleJson : ocrSpecialRuleJsons) {
+                if (Func.isEmpty(ocrSpecialRuleJson.getKeyWord())){
+                    continue;
+                }
                 double score = ocrSpecialRuleJson.getScore();
                 String[] keyWordList = ocrSpecialRuleJson.getKeyWord().split("#");
                 for (String ocrText : ocrTextList) {

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -156,10 +157,14 @@ public class OcrVersionServiceImpl implements IOcrVersionService {
     public boolean edit(EditOcrVersionDTO editOcrVersionDTO) {
 
         //之前启用的全部变成不起用
-        List<OcrVersion> isEnableList = iOcrVersionDao.findBy("isEnable", "1").stream().peek(p-> p.setIsEnable(false)).collect(Collectors.toList());
+        List<OcrVersion> isEnableList = iOcrVersionDao.findBy("isEnable", "1")
+                .stream().peek(p-> p.setIsEnable(false))
+                .collect(Collectors.toList());
         iOcrVersionDao.updateBatchById(isEnableList,1000);
 
-        OcrVersion ocrVersion = OcrVersionConvert.INSTANCE.convertDO(editOcrVersionDTO);
+        OcrVersion ocrVersion = iOcrVersionDao.findById(editOcrVersionDTO.getId());
+        ocrVersion.setUpdateTime(new Date());
+        ocrVersion.setIsEnable(true);
         return iOcrVersionDao.edit(ocrVersion);
 
     }