From ec2bb08f0aad10bbf1f133046d8e9943be3a6d72 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 15:34:44 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --3修改签到撤销接口不判断作废状态
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 748adfe..5874982 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -439,24 +439,28 @@
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
- String jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId());
+ List<String> jcsqdh = orderService.getHuoQuJcsqdh(order.getCardId());
- String jysqdh = orderService.getHuoQuJysqdh(order.getCardId());
+ List<String> jysqdh = orderService.getHuoQuJysqdh(order.getCardId());
- String zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
+ List<String> zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
- if (null != jcsqdh) {
- AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", jcsqdh);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- if (code.equals("0")) {
- orderService.delHuoQuJcsqdh(order.getCardId());
- } else {
- return false;
+ if (null != jcsqdh && jcsqdh.size()>0) {
+ for (String s : jcsqdh) {
+ AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ orderService.delHuoQuJcsqdh(order.getCardId());
+ }
+// else {
+// return false;
+// }
}
+
}
@@ -467,26 +471,31 @@
JSONObject object1 = null;
String code1 = null;
- if (null != jysqdh) {
- ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", jysqdh);
- result2 = getAjaxResult(ajaxResult);
- object1 = getJSONObject(result2);
- code1 = object1.getStr("ResultCode");
- if (code1.equals("0")) {
- orderService.delHuoQuJysqdh(order.getCardId());
- } else {
- return false;
+ if (null != jysqdh && jysqdh.size()>0) {
+ for (String s : jysqdh) {
+ ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+ if (code1.equals("0")) {
+ orderService.delHuoQuJysqdh(order.getCardId());
+ }
+// else {
+// return false;
+// }
}
}
//2.1.6.9 浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠
- if (null != zlsqdh) {
- ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", zlsqdh);
- result2 = getAjaxResult(ajaxResult);
- object1 = getJSONObject(result2);
- code1 = object1.getStr("ResultCode");
- if (!code1.equals("0")) {
- return false;
+ if (null != zlsqdh && zlsqdh.size()>0) {
+ for (String s : zlsqdh) {
+ ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
+ result2 = getAjaxResult(ajaxResult);
+ object1 = getJSONObject(result2);
+ code1 = object1.getStr("ResultCode");
+// if (!code1.equals("0")) {
+// return false;
+// }
}
}
//2.1.3 闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖
@@ -494,9 +503,9 @@
result2 = getAjaxResult(ajaxResult);
object1 = getJSONObject(result2);
code1 = object1.getStr("ResultCode");
- if (!code1.equals("0")) {
- return false;
- }
+// if (!code1.equals("0")) {
+// return false;
+// }
return true;
}
--
Gitblit v1.8.0