Merge branch 'master' of https://mc.cloudpure.cn/mjava/merservice

src/main/java/com/malk/pro/guyuan/controller/NhIVController.java

@@ -58,6 +58,9 @@ public class NhIVController {
     @Autowired
     private YDClient ydClient;
 
+    @Autowired
+    private YDConf ydConf;
+
     private final static String APP_TYPE="APP_Y5KGBSIKJGG6ZQBTNKSZ";
     private final static String SYSTEM_TOKEN="GFA66U91QQDMO11Y7N7YC7MA6U0M236VMM2YLBO11";
 
@@ -369,7 +372,11 @@ public class NhIVController {
             McException.assertAccessException(StringUtils.isBlank(invoiceNo), serial + ", 识别结果为空, 请检查!");
             YDParam ydParam = YDParam.builder().systemToken(SYSTEM_TOKEN).appType(APP_TYPE)
                     .formUuid("FORM-442A54C312A64FCA9C1D19C7C1AD7314MXAJ")
-                    .searchFieldJson(JSON.toJSONString(UtilMap.map("radioField_liihyrtb, textField_liihyrt8", "否", invoiceNo)))
+                    .searchFieldJson(JSON.toJSONString(Arrays.asList(
+                            ydConf.searchCondition_TextFiled("radioField_liihyrtb","否","eq"),
+                            ydConf.searchCondition_TextFiled("textField_liihyrt8",invoiceNo,"eq")
+                    )))
+//                    .searchFieldJson(JSON.toJSONString(UtilMap.map("radioField_liihyrtb, textField_liihyrt8", "否", invoiceNo)))
                     .build();
             List<String> idList = (List<String>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form_id).getData();
             if (idList.size() > 0) {