From 33d29b3232befedc28bce8760d97c5cd6f253d3c Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 15 Sep 2023 22:43:56 +0800
Subject: [PATCH] updates

---
 .../jeecg/common/constant/OcrConstant.java    |  2 +-
 .../OcrMetadataConfigController.java          |  1 +
 .../modules/ocr/init/HandleTransInit.java     |  1 -
 .../service/impl/OcrIdentifyServiceImpl.java  | 20 +++++++++++++++++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/OcrConstant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/OcrConstant.java
index 5aa473e..f58f388 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/OcrConstant.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/OcrConstant.java
@@ -47,6 +47,6 @@ public class OcrConstant {
     //目前仅支持的字段
     public static List<String> SUPPORTED_FIELDS= Arrays.asList("hospitalName","doctorName","departmentName","time");
     //目前仅支持的字段中文名
-    public static List<String> SUPPORTED_FIELD_NAMES= Arrays.asList("医院名称","医生名称","姓名","科室","时间");
+    public static List<String> SUPPORTED_FIELD_NAMES= Arrays.asList("医院名称","医生名称","姓名","科室","时间","日期");
 
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java
index f0809d1..4a2d1cc 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java
@@ -253,6 +253,7 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
                 List<String> getFieldList;
                 for (OcrMetadataConfigDTO configVo : list) {
                     saveOcrMetadataConfigVO =new SaveOcrMetadataConfigVO();
+                    AssertUtils.notEmpty(configVo.getConfigName(),"[配置名称]不可为空");
                     saveOcrMetadataConfigVO.setConfigName(configVo.getConfigName());
                     resultName = configVo.getResultName();
                     getField = configVo.getGetField();
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java
index eb69d94..47d0b01 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/init/HandleTransInit.java
@@ -184,7 +184,6 @@ public class HandleTransInit implements ApplicationRunner {
                 }else{
                     log.info("图片不存在:");
                     log.info(masterTaskId);
-                    //log.info(semanticResponseJson.toJSONString());
                 }
                 //该子任务已执行，判断主任务是否残留
                 String masterTask = (String) redisUtil.get("identify_" + masterTaskId);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
index 7346778..2a949c2 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
@@ -202,6 +202,14 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                                     break;
                                 }
                             }
+                        }else if (Arrays.asList("日期", "时间").contains(s)) {
+                            for (String s1 : Arrays.asList("日期", "时间")) {
+                                JSONArray semantic_result = semanticResult.getJSONObject("semantic_result").getJSONArray(s1);
+                                if (CollectionUtils.isNotEmpty(semantic_result)) {
+                                    jsonArray.addAll(semantic_result);
+                                    break;
+                                }
+                            }
                         }else{
                             jsonArray = semanticResult.getJSONArray(s);
                         }
@@ -593,7 +601,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
             e.printStackTrace();
         }
         String task_ = (String) redisUtil.get("task_identify_" + taskLevel);//TODO task_
-        log.info("历史任务:" + task_);
+        //log.info("历史任务:" + task_);
         if (task_ == null || task_.equals("[]")) {
             //无历史任务
             TaskModel task = new TaskModel(taskId, taskLevel, taskType, "0", parameter);
@@ -778,7 +786,15 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                             }
                         }
                     }else if (Arrays.asList("医院名称","医院").contains(s)) {
-                        for (String s1 : Arrays.asList("医院名称","医院")) {
+                        for (String s1 : Arrays.asList("医院名称", "医院")) {
+                            JSONArray semantic_result = semanticResult.getJSONObject("semantic_result").getJSONArray(s1);
+                            if (CollectionUtils.isNotEmpty(semantic_result)) {
+                                jsonArray.addAll(semantic_result);
+                                break;
+                            }
+                        }
+                    }else if (Arrays.asList("日期", "时间").contains(s)) {
+                        for (String s1 : Arrays.asList("日期", "时间")) {
                             JSONArray semantic_result = semanticResult.getJSONObject("semantic_result").getJSONArray(s1);
                             if (CollectionUtils.isNotEmpty(semantic_result)) {
                                 jsonArray.addAll(semantic_result);