From 336fcbb559d0916cbbc8d962d1da954911388663 Mon Sep 17 00:00:00 2001 From: zhanglb Date: Tue, 12 Sep 2023 08:31:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?=E6=B2=A1=E8=AE=BE=E7=BD=AE=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/impl/OcrBasicTestDaoImpl.java | 14 +++++++------- .../server/service/impl/OcrRuleServiceImpl.java | 6 ++++++ .../service/impl/OcrRuleTestServiceImpl.java | 6 ++++++ .../service/impl/OcrSpecialRuleServiceImpl.java | 3 +++ .../impl/OcrSpecialRuleTestServiceImpl.java | 3 +++ .../server/service/impl/OcrVersionServiceImpl.java | 9 +++++++-- 6 files changed, 32 insertions(+), 9 deletions(-) diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java index fbe07ca..8ed44e9 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java @@ -80,13 +80,13 @@ public class OcrBasicTestDaoImpl extends BaseDaoImpl 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"); diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java index 0f537af..15b949d 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java @@ -88,6 +88,9 @@ public class OcrRuleServiceImpl implements IOcrRuleService { List 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 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++) { diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java index 99c4251..d38a3c8 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java +++ b/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 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++) { diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java index 82ddd09..5f758e0 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java @@ -121,6 +121,9 @@ public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService { List 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) { diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java index 5831f88..b30d88c 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java @@ -51,6 +51,9 @@ public class OcrSpecialRuleTestServiceImpl implements IOcrSpecialRuleTestService List 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) { diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java index c18dd3a..2e2168a 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java +++ b/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 isEnableList = iOcrVersionDao.findBy("isEnable", "1").stream().peek(p-> p.setIsEnable(false)).collect(Collectors.toList()); + List 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); }