LIJU 3 weeks ago
parent
commit
07d88ecf7d
1 changed files with 11 additions and 14 deletions
  1. 11 14
      src/main/java/thyyxxk/sizyfeeoprnsystm/service/SiZyFeeService.java

+ 11 - 14
src/main/java/thyyxxk/sizyfeeoprnsystm/service/SiZyFeeService.java

@@ -635,16 +635,14 @@ public class SiZyFeeService {
         JSONObject input = new JSONObject();
         input.put("action", "transaction");
         input.put("transactionName", "2205");
-        input.put("businessParams", new JSONObject());
-        JSONArray data = new JSONArray();
-        p.getDetailSns().forEach(detailSn -> {
-            JSONObject item = new JSONObject();
-            item.put("feedetl_sn", detailSn);
-            item.put("mdtrt_id", siPatInfo.getMdtrtId());
-            item.put("psn_no", siPatInfo.getPsnNo());
-            data.add(item);
-        });
-        input.getJSONObject("businessParams").put("data", data);
+        JSONObject businessParams = new JSONObject();
+        // 工伤撤销只能单个输入,取第一个明细
+        if (!p.getDetailSns().isEmpty()) {
+            businessParams.put("feedetl_sn", p.getDetailSns().get(0));
+            businessParams.put("mdtrt_id", siPatInfo.getMdtrtId());
+            businessParams.put("psn_no", siPatInfo.getPsnNo());
+        }
+        input.put("businessParams", businessParams);
         
         // 调用工伤撤销接口
         JSONObject result = exec.executeWorkInjuryTrade(input);
@@ -682,7 +680,7 @@ public class SiZyFeeService {
         JSONObject input = new JSONObject();
         input.put("action", "transaction");
         input.put("transactionName", "2204");
-        input.put("businessParams", new JSONObject());
+        input.put("businessParams", new JSONArray());
         List<FeeDtle> tempList = new ArrayList<>();
         
         while (!feeQueue.isEmpty()) {
@@ -757,7 +755,7 @@ public class SiZyFeeService {
      */
     private int[] executeWorkInjuryUploadFees(JSONObject input, List<FeeDtle> fees, ZyPatientInfo p) {
         String ref = JSONArray.toJSONString(fees);
-        input.getJSONObject("businessParams").put("feedetail", JSONArray.parse(ref));
+        input.put("businessParams", JSONArray.parse(ref));
         
         // 调用工伤费用上传接口
         JSONObject result = exec.executeWorkInjuryTrade(input);
@@ -816,9 +814,8 @@ public class SiZyFeeService {
         JSONObject input = new JSONObject();
         input.put("action", "transaction");
         input.put("transactionName", "2206");
-        input.put("businessParams", new JSONObject());
         String ref = JSONObject.toJSONString(zyPreSetlmt);
-        input.getJSONObject("businessParams").put("data", JSONObject.parseObject(ref));
+        input.put("businessParams", JSONObject.parseObject(ref));
         
         // 调用工伤预结算接口
         JSONObject result = exec.executeWorkInjuryTrade(input);