lighter 1 год назад
Родитель
Сommit
2ef4e93ac0

+ 0 - 3
src/main/java/thyyxxk/webserver/service/dictionary/NationalMatchService.java

@@ -237,9 +237,6 @@ public class NationalMatchService {
         input.getJSONObject("input").put("data", data);
         JSONObject result = exec.executeTrade(input, SiFunction.DOWNLOAD_MEDICAL_INSURANCE_PAY_FIRST_CATALOGUE);
         log.info("查询自付比例:\n参数:{}\n结果:{}", input, result);
-        if (null == result || null == result.getInteger("infcode")) {
-            return null;
-        }
         String psnPayProp = null;
         if (result.getIntValue("infcode") == 0) {
             JSONObject output = result.getJSONObject("output");

+ 2 - 2
src/main/java/thyyxxk/webserver/service/medicalinsurance/SiDownloadService.java

@@ -1096,7 +1096,7 @@ public class SiDownloadService {
             return 0;
         }
         String psnPayProp = null;
-        String nowdate = "2022-10-20 00:00:00";
+        String nowdate = DateUtil.formatDatetime(new Date());
         if (result.getIntValue(RESULT_CODE) == 0) {
             JSONObject output = result.getJSONObject(OUTPUT);
             JSONArray array = output.getJSONArray("data");
@@ -1108,7 +1108,7 @@ public class SiDownloadService {
                 for (int i = 0; i < recordCounts; i++) {
                     JSONObject target = array.getJSONObject(i);
                     String enddate = target.getString("enddate");
-                    if (DateUtil.shiJianDaXiao(nowdate, enddate, "<")) {
+                    if (DateUtil.shiJianDaXiao(nowdate, enddate, "<=")) {
                         nowdate = enddate;
                         psnPayProp = target.getString("selfpay_prop");
                     }