|
|
@ -516,13 +516,14 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 组装 checkSemanticModelMap
|
|
|
|
* 组装 checkSemanticModelMap
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param configRuleMap 1/0 map
|
|
|
|
* @param oldConfigRuleMap 1/0 map
|
|
|
|
* @param fieldMap 字段含义 map
|
|
|
|
* @param fieldMap 字段含义 map
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public Map<String, CheckSemanticModel> getCheckSemanticModelMap(Map<String, String> configRuleMap, Map<String, String> fieldMap, List<JSONObject> sourceJsonObjects) {
|
|
|
|
public Map<String, CheckSemanticModel> getCheckSemanticModelMap(Map<String, String> oldConfigRuleMap, Map<String, String> fieldMap, List<JSONObject> sourceJsonObjects) {
|
|
|
|
if (configRuleMap!=null && CollectionUtils.isNotEmpty(configRuleMap.keySet())) {
|
|
|
|
Map<String, String> configRuleMap=new LinkedHashMap<>();
|
|
|
|
for (String s : configRuleMap.keySet()) {
|
|
|
|
if (oldConfigRuleMap!=null && CollectionUtils.isNotEmpty(oldConfigRuleMap.keySet())) {
|
|
|
|
String value = configRuleMap.get(s);
|
|
|
|
for (String s : oldConfigRuleMap.keySet()) {
|
|
|
|
|
|
|
|
String value = oldConfigRuleMap.get(s);
|
|
|
|
if ("hn".equals(s)) {
|
|
|
|
if ("hn".equals(s)) {
|
|
|
|
configRuleMap.put("hospitalName",value);
|
|
|
|
configRuleMap.put("hospitalName",value);
|
|
|
|
}else if("dn".equals(s)) {
|
|
|
|
}else if("dn".equals(s)) {
|
|
|
@ -531,6 +532,8 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
|
|
|
|
configRuleMap.put("departmentName", value);
|
|
|
|
configRuleMap.put("departmentName", value);
|
|
|
|
}else if("tm".equals(s) || ("time".equals(s))) {
|
|
|
|
}else if("tm".equals(s) || ("time".equals(s))) {
|
|
|
|
configRuleMap.put("time", value);
|
|
|
|
configRuleMap.put("time", value);
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
configRuleMap.put(s,value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|