经营性道路货物运输驾驶员从业资格证申领;网络预约出租汽车驾驶员证核发，bug修改

reborts/src/main/java/com/lilosoft/business/rocr/service/project/yibin/DLYSCYZGZHFBDHJService.java

@@ -313,9 +313,7 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
         String resultJSONStr = result.get("result") == null ? "" : result.get("result").toString();
         resultJSONStr = resultJSONStr.replaceAll(" ", "");
         if (StringUtils.isNotEmpty(resultJSONStr)) {
-            log.info("fileId:"+fileId);
             JSONObject resultJSON = JSONObject.parseObject(resultJSONStr);
-            log.info("resultJSONStr:"+resultJSONStr);
             if (resultJSON != null && StringUtils.isNotEmpty(resultJSON.getString("status")) && resultJSON.getIntValue("status") == 200) {
                 JSONArray datas = resultJSON.getJSONArray("data");
                 String sealImageId = resultJSON.getString("sealImageId");
@@ -372,7 +370,7 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
                         } else if ("js_card".equals(code)) {//驾驶证
                             tempCheckData = ConvertJsonToMap.wordConvertJsonToMap(checkData, sealImageId);
                             driverLicenseCheckData.add(tempCheckData);
-                            name.add("身份证");
+                            name.add("驾驶证");
                         } else {
                             name.add("其他");
                         }

reborts/src/main/java/com/lilosoft/business/rocr/service/project/yibin/JYXDLHWYSJSYCYZGZSLBDHJService.java

@@ -34,8 +34,6 @@ public class JYXDLHWYSJSYCYZGZSLBDHJService extends BaseProjectService {
     @Override
     public void accept(String fileData, RobotCase rc) throws Exception {
         JSONArray fileDataArray = JSONArray.parseArray(fileData);
-        log.info(fileData);
-        log.info(JSONObject.toJSONString(rc));
         Map<String, Object> dests = new HashMap<>();
         String busiDesc = "";
         Map<String, Object> returnMap = new HashMap<>();
@@ -284,9 +282,7 @@ public class JYXDLHWYSJSYCYZGZSLBDHJService extends BaseProjectService {
         String resultJSONStr = result.get("result") == null ? "" : result.get("result").toString();
         resultJSONStr = resultJSONStr.replaceAll(" ", "");
         if (StringUtils.isNotEmpty(resultJSONStr)) {
-            log.info("fileId:"+fileId);
             JSONObject resultJSON = JSONObject.parseObject(resultJSONStr);
-            log.info("resultJSONStr:"+resultJSONStr);
             if (resultJSON != null && StringUtils.isNotEmpty(resultJSON.getString("status")) && resultJSON.getIntValue("status") == 200) {
                 JSONArray datas = resultJSON.getJSONArray("data");
                 String sealImageId = resultJSON.getString("sealImageId");
@@ -334,7 +330,7 @@ public class JYXDLHWYSJSYCYZGZSLBDHJService extends BaseProjectService {
                         } else if ("js_card".equals(code)) {//驾驶证
                             tempCheckData = ConvertJsonToMap.wordConvertJsonToMap(checkData, sealImageId);
                             driverLicenseCheckData.add(tempCheckData);
-                            name.add("身份证");
+                            name.add("驾驶证");
                         } else {
                             name.add("其他");
                         }

reborts/src/main/java/com/lilosoft/business/rocr/service/project/yibin/WLYYCZQCJSYZHFBDHJService.java

@@ -34,8 +34,6 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
     @Override
     public void accept(String fileData, RobotCase rc) throws Exception {
         JSONArray fileDataArray = JSONArray.parseArray(fileData);
-        log.info(fileData);
-        log.info(JSONObject.toJSONString(rc));
         Map<String, Object> dests = new HashMap<>();
         String busiDesc = "";
         Map<String, Object> returnMap = new HashMap<>();
@@ -122,7 +120,7 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
                                 if (textAll == null) {
                                     textAll = tempName;
                                 }
-                                if (!ObjectUtils.isEmpty(tempName) && !textAll.contains(tempName)) {
+                                if (!ObjectUtils.isEmpty(tempName) && textAll.contains(tempName)) {
                                     personIdcard = true;
                                     break;
                                 }
@@ -156,7 +154,7 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
             }
             try {
                 //身份证应与巡游驾驶员证一致
-                if(!ObjectUtils.isEmpty(driverLicenseCheckData)) {
+                if(!ObjectUtils.isEmpty(patrolDriverCheckData)) {
                     if (!ObjectUtils.isEmpty(idcardCheckData) && idcardCheckData.size() == 1) {
                         boolean personIdcard = false;
                         String textAll = JSONObject.toJSONString(patrolDriverCheckData.get(0));
@@ -165,7 +163,7 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
                             if (textAll == null) {
                                 textAll = tempName;
                             }
-                            if (!ObjectUtils.isEmpty(tempName) && !textAll.contains(tempName)) {
+                            if (!ObjectUtils.isEmpty(tempName) && textAll.contains(tempName)) {
                                 personIdcard = true;
                                 break;
                             }
@@ -275,7 +273,7 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
             rc.setRpaData(Base64Helper.encode(JSON.toJSONString(userData).getBytes()));
             getPubProjectService().genCaseResult(reportResultList, rc, isOk);
         } catch (Exception e) {
-            logger.error("经营性道路货物运输驾驶员从业资格证申领资料识别最终结果验证处理异常!", e);
+            logger.error("网络预约出租汽车驾驶员证核发资料识别最终结果验证处理异常!", e);
             getPubProjectService().genCaseResult(null, rc, false);
         }
     }
@@ -312,9 +310,7 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
         String resultJSONStr = result.get("result") == null ? "" : result.get("result").toString();
         resultJSONStr = resultJSONStr.replaceAll(" ", "");
         if (StringUtils.isNotEmpty(resultJSONStr)) {
-            log.info("fileId:"+fileId);
             JSONObject resultJSON = JSONObject.parseObject(resultJSONStr);
-            log.info("resultJSONStr:"+resultJSONStr);
             if (resultJSON != null && StringUtils.isNotEmpty(resultJSON.getString("status")) && resultJSON.getIntValue("status") == 200) {
                 JSONArray datas = resultJSON.getJSONArray("data");
                 String sealImageId = resultJSON.getString("sealImageId");
@@ -330,9 +326,9 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
                         //表格类
                         if ("table".equals(code)) {
                             tempCheckData = ConvertJsonToMap.tableConvertJsonToMap(checkData, sealImageId);
-                            if (checkDataStr.contains("经营性道路货物运输驾驶员") && checkDataStr.contains("从业资格证")) {
+                            if (checkDataStr.contains("网络预约出租汽车驾驶员证核发")) {
                                 petitionCheckData.add(tempCheckData);
-                                name.add("经营性道路货物运输驾驶员从业资格证登记表申领表");
+                                name.add("网络预约出租汽车驾驶员证核发申请表");
                             }else if(checkDataStr.contains("中华人民共和国机动车驾驶证")){
                                 driverLicenseCheckData.add(tempCheckData);
                                 name.add("驾驶证");
@@ -362,7 +358,7 @@ public class WLYYCZQCJSYZHFBDHJService extends BaseProjectService {
                         } else if ("js_card".equals(code)) {//驾驶证
                             tempCheckData = ConvertJsonToMap.wordConvertJsonToMap(checkData, sealImageId);
                             driverLicenseCheckData.add(tempCheckData);
-                            name.add("身份证");
+                            name.add("驾驶证");
                         } else {
                             name.add("其他");
                         }