转化修改

common/src/main/java/com/lantone/common/util/StringUtil.java

@@ -225,6 +225,30 @@ public class StringUtil {
         }
     }
 
+    /**
+     * 解析时间
+     *
+     * @param datetime
+     * @return
+     */
+    public static Date parseDateTime(String datetime) {
+        Date date = null;
+        try {
+            datetime = remove_ctl(datetime);
+
+            if (datetime.contains("至")) {
+                datetime = datetime.split("至")[1].replaceAll("[\\u4e00-\\u9fa5]", "");
+            }
+
+            if (datetime.length() > 0) {
+                date = DateUtils.parseDate(datetime, dateFormats);
+            }
+        } catch (ParseException ex) {
+            ex.printStackTrace();
+        }
+        return date;
+    }
+
     public static String matRegx(String source, String regex1, String regex2, String val) {
         if (isNotBlank(source) && isNotBlank(regex1) && isNotBlank(regex2)) {
             Pattern pattern = Pattern.compile(regex1);
@@ -276,4 +300,68 @@ public class StringUtil {
         return ret;
     }
 
+    public static String[] dateFormats = {
+            "yyyy年MM月dd日HH时mm分",
+            "yyyy年MM月dd日HH:mm",
+            "yyyy年MM月dd日H时mm分",
+            "yyyy年MM月dd日HH时m分",
+            "yyyy年MM月dd日H时m分",
+            "yyyy年M月dd日HH时mm分",
+            "yyyy年M月dd日H时mm分",
+            "yyyy年M月dd日HH时m分",
+            "yyyy年M月dd日H时m分",
+            "yyyy年MM月d日HH时mm分",
+            "yyyy年MM月d日H时mm分",
+            "yyyy年MM月d日HH时m分",
+            "yyyy年MM月d日H时m分",
+            "yyyy年M月d日HH时mm分",
+            "yyyy年M月d日H时mm分",
+            "yyyy年M月d日HH时m分",
+            "yyyy年M月d日H时m分",
+            "yyyy-MM-ddHH:mm:ss",
+            "yyyy-MM-ddHH:mm",
+            "yyyy-MM-ddHH：mm",
+            "yyyy-MM-ddHH:m",
+            "yyyy-MM-ddH:mm",
+            "yyyy-MM-ddH:m",
+            "yyyy-M-ddHH:mm",
+            "yyyy-M-ddHH:m",
+            "yyyy-M-ddH:mm",
+            "yyyy-M-ddH:m",
+            "yyyy-MM-dHH:mm",
+            "yyyy-MM-dHH:m",
+            "yyyy-MM-dH:mm",
+            "yyyy-MM-dH:m",
+            "yyyy-M-dHH:mm",
+            "yyyy-M-dHH:m",
+            "yyyy-M-dH:mm",
+            "yyyy-M-dH:m",
+            "yyyy-MM-dd",
+            "yyyy年MM月dd日H时",
+            "yyyy/MM/ddHH:mm:ss",
+            "yyyy/MM/ddHH:mm",
+            "yyyy/MM/ddHH:m",
+            "yyyy/MM/ddH:mm",
+            "yyyy/MM/ddH:m",
+            "yyyy/MM/ddHH:mm:",
+            "yyyy/M/ddHH:mm",
+            "yyyy/M/ddHH:m",
+            "yyyy/M/ddH:mm",
+            "yyyy/M/ddH:m",
+            "yyyy/MM/dHH:mm",
+            "yyyy/MM/dHH:m",
+            "yyyy/MM/dH:mm",
+            "yyyy/MM/dH:m",
+            "yyyy/M/dHH:mm",
+            "yyyy/M/dHH:m",
+            "yyyy/M/dH:mm",
+            "yyyy/M/dH:m",
+            "yyyy/MM/dd",
+            "yyyy.MM.dd",
+            "yyyy-MM-ddHH:mm:ss.000",
+            "yyyyMMddHH:mm",
+            "yyyy-MM-dd'T'HH:mm:ss",
+            "yyyy-MM-ddTHH:mm:ss",
+    };
+
 }

structure-center/src/main/java/com/lantone/structure/facade/tran/ClinicalBloodTran.java

@@ -22,7 +22,7 @@ import java.util.Map;
 public class ClinicalBloodTran extends TargetTran {
 
     @Override
-    Map<String, String> convert(String text) {
+    public Map<String, String> convert(String text) {
         List<ClinicalBloodDoc> clinicalBloodDocList = new ArrayList<>();
         ClinicalBloodDoc clinicalBloodDoc = new ClinicalBloodDoc();
         clinicalBloodDoc.setText(text);
@@ -44,8 +44,8 @@ public class ClinicalBloodTran extends TargetTran {
                     } else {
                         StringBuffer sbX = new StringBuffer();
                         for (Map.Entry<String, Object> firstDateEntry : firstJsonMap.entrySet()) {
-                            String beanToJson = FastJsonUtils.getBeanToJson( firstDateEntry.getValue());
-                            if(beanToJson.contains("name")||beanToJson.contains("measurementUnit")){
+                            String beanToJson = FastJsonUtils.getBeanToJson(firstDateEntry.getValue());
+                            if (beanToJson.contains("name") || beanToJson.contains("measurementUnit")) {
                                 Map<String, Object> jsonToMap = FastJsonUtils.getJsonToMap(FastJsonUtils.getBeanToJson(firstDateEntry.getValue()));
                                 if (jsonToMap.size() == 1) {
                                     String childKey = keyContrastMap.get(firstDateEntry.getKey());
@@ -54,22 +54,22 @@ public class ClinicalBloodTran extends TargetTran {
                                     } else {
                                         retMap.put(childKey, (String) jsonToMap.get("name"));
                                     }
-                                }else{
+                                } else {
                                     for (Map.Entry<String, Object> typeObjectEntry : jsonToMap.entrySet()) {
                                         Object value = typeObjectEntry.getValue();
-                                        if(value instanceof JSONObject){
+                                        if (value instanceof JSONObject) {
                                             Map<String, Object> objToMap = FastJsonUtils.getJsonToMap(FastJsonUtils.getBeanToJson(value));
                                             sbX.append(objToMap.get("name"));
-                                        }else{
-                                            sbX.append( jsonToMap.get("name"));
+                                        } else {
+                                            sbX.append(jsonToMap.get("name"));
                                         }
 
                                     }
                                 }
-                            }else{
+                            } else {
                                 sbX.append(firstDateEntry.getValue());
                             }
-                            retMap.put(keyContrastMap.get(dateEntry.getKey()),sbX.toString());
+                            retMap.put(keyContrastMap.get(dateEntry.getKey()), sbX.toString());
                         }
 
                     }
@@ -77,17 +77,17 @@ public class ClinicalBloodTran extends TargetTran {
                     List<Map<String, Object>> jsonToListMap = FastJsonUtils.getJsonToListMap(FastJsonUtils.getBeanToJson(dateEntry.getValue()));
                     int count = 1;
                     StringBuffer sb = new StringBuffer();
-                    if(jsonToListMap.size()==1){
+                    if (jsonToListMap.size() == 1) {
                         Object name = jsonToListMap.get(0).get("name");
-                        retMap.put(keyContrastMap.get(dateEntry.getKey()),String.valueOf(name));
-                    }else{
+                        retMap.put(keyContrastMap.get(dateEntry.getKey()), String.valueOf(name));
+                    } else {
                         for (Map<String, Object> mapList : jsonToListMap) {
                             for (Map.Entry<String, Object> stringObjectEntry : mapList.entrySet()) {
-                                if(stringObjectEntry.getKey()=="negative"){
+                                if (stringObjectEntry.getKey() == "negative") {
                                     Map<String, Object> negativeJsonMap = FastJsonUtils.getJsonToMap(FastJsonUtils.getBeanToJson(stringObjectEntry.getValue()));
                                     Object negativeObject = negativeJsonMap.get("name");
-                                    sb.append((count++) + "." +(negativeObject==null? "":negativeObject));
-                                }else if(stringObjectEntry.getKey()=="name"){
+                                    sb.append((count++) + "." + (negativeObject == null ? "" : negativeObject));
+                                } else if (stringObjectEntry.getKey() == "name") {
                                     sb.append(stringObjectEntry.getValue());
                                 }
                             }

structure-center/src/main/java/com/lantone/structure/facade/tran/RescueTran.java

@@ -16,7 +16,7 @@ import java.util.Map;
 public class RescueTran extends TargetTran {
 
     @Override
-    Map<String, String> convert(String text) {
+    public Map<String, String> convert(String text) {
         List<RescueDoc> rescueDocList = new ArrayList<>();
         RescueDoc rescueDoc = new RescueDoc();
         rescueDoc.setText(text);

structure-center/src/main/java/com/lantone/structure/facade/tran/StagesSummaryTran.java

@@ -16,7 +16,7 @@ import java.util.Map;
 public class StagesSummaryTran extends TargetTran {
 
     @Override
-    Map<String, String> convert(String text) {
+    public Map<String, String> convert(String text) {
         List<StagesSummaryDoc> stagesSummaryDocList = new ArrayList<>();
         StagesSummaryDoc stagesSummaryDoc = new StagesSummaryDoc();
         stagesSummaryDoc.setText(text);

structure-center/src/main/java/com/lantone/structure/facade/tran/TargetTran.java

@@ -24,9 +24,9 @@ public abstract class TargetTran {
     public abstract Map<String, String> convert(String text);
 
     public TargetTran() {
-        this.inputInfo = inputInfo;
-        similarityServiceClient = SpringContextUtil.getBean("similarityServiceClient");
-        crfServiceClient = SpringContextUtil.getBean("crfServiceClient");
+        this.inputInfo = new InputInfo();
+        similarityServiceClient = SpringContextUtil.getBean(SimilarityServiceClient.class);
+        crfServiceClient = SpringContextUtil.getBean(CRFServiceClient.class);
     }
 
     public void aiProcess() {