From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 190be30..2b3d4ca 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -8,6 +8,7 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.RepeatSubmit;
@@ -297,7 +298,7 @@
tjOrder.setConfirmStatus(String.valueOf(status));
if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
- asyncService.updateCheckType(tjNumber);
+// asyncService.updateCheckType(tjNumber);
} else {
tjOrder.setStatus(TjConstants.TJ_REFUSED);
}
@@ -307,8 +308,8 @@
confirmLog.setTjNum(tjNumber);
confirmLog.setStatus(status);
confirmLogService.save(confirmLog);
- asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
- asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
+// asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 0, null, null, null));
+// asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, 1, null, null, null));
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
return AjaxResult.error("鎿嶄綔澶辫触");
@@ -594,9 +595,9 @@
if ("Y".equals(getInfoFromSqlData)) {
tbhyxm(order);
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
asyncService.updateCheckType(order.getTjNumber());
}
@@ -605,7 +606,7 @@
List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
//鍚屾妫�楠�
- if (null != baoGaoDans && baoGaoDans.size() > 0) {
+ if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
Date dates = new Date();
Map<String, Object> map = new HashMap<>();
map.put("his_registration_id", order.getCardId());
@@ -641,7 +642,8 @@
hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
- List<LtkjHysqd> list = ltkjHysqdService.listByMap(BeanUtil.beanToMap(hysqd));
+ QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
+ List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
if (list.isEmpty())
isInsertHysqd = true;
if (isInsertHysqd){
@@ -651,7 +653,7 @@
}
}
//鍚屾鍖栭獙椤圭洰
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
}
/*鍚屾妫�鏌� his鎺ュ彛*/
if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
@@ -669,7 +671,9 @@
log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + results.toString());
if (Integer.parseInt(results.get("code").toString()) == 200) {
List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
- if (null != datas && datas.size() > 0) {
+ if (null != datas && !datas.isEmpty()) {
+ jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
+ jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
for (Map<String, Object> objectMap : datas) {
//淇濆瓨鍏ュ弬鍑哄弬
service.save(JSONUtil.parseObj(objectMap), "Getexamreportinfo", hisApiConfig, JSONUtil.toJsonStr(maps));
@@ -704,14 +708,10 @@
jcbgd.setJcbw(objectMap.get("JCBW").toString());
if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
- List<LtkjExamJcbgd> list = jcbgdService.listByMap(BeanUtil.beanToMap(jcbgd));
- if (list.isEmpty())
- jcbgdService.save(jcbgd);
+ jcbgdService.save(jcbgd);
}
- List<LtkjExamJcbgd> list = jcsqdService.queryLtkjExamJcsqdByTjh(order.getCardId());
- if (list.isEmpty())
- jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ jcsqdService.saveLtkjExamJcsqd(order.getCardId());
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -720,7 +720,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
//鍖栭獙
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), "148");
//妫�鏌�
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
return AjaxResult.success("鍚屾鎴愬姛");
@@ -764,7 +764,8 @@
bgd.setShysmc(js.getStr("SHRXM"));
bgd.setYcbz(js.getStr("YCTS"));
// bgd.setTpurl(js.getStr(""));
- List<LtkjHybgd> list = ltkjHybgdService.listByMap(BeanUtil.beanToMap(bgd));
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
if (list.isEmpty())
ltkjHybgdService.save(bgd);
}
@@ -795,7 +796,8 @@
bgd.setShsj(js.getStr("BGRQ"));
bgd.setShys(hysqd.getShrdm());
bgd.setShysmc(hysqd.getShrxm());
- List<LtkjHybgd> list = ltkjHybgdService.listByMap(BeanUtil.beanToMap(bgd));
+ QueryWrapper<LtkjHybgd> queryWrapper = new QueryWrapper<>(bgd);
+ List<LtkjHybgd> list = ltkjHybgdService.list(queryWrapper);
if (list.isEmpty())
ltkjHybgdService.save(bgd);
}
@@ -1217,7 +1219,7 @@
// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
// if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
// tbhyxm(one);
- TjCustomer customer = customerService.getById(one.getUserId());
+// TjCustomer customer = customerService.getById(one.getUserId());
List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanAndCgTable(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);
@@ -1245,21 +1247,27 @@
BigDecimal min = new BigDecimal(split[0]);
BigDecimal max = new BigDecimal(split[1]);
String proResult = tjOrderDetail.getProResult();
- BigDecimal jyjgval = new BigDecimal(proResult);
- if (jyjgval.compareTo(min) < 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if (jyjgval.compareTo(max) > 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else {
+ if(null !=proResult){
+ BigDecimal jyjgval = new BigDecimal(proResult);
+ if (jyjgval.compareTo(min) < 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (jyjgval.compareTo(max) > 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ }
+ else {
+ tjOrderDetail.setYcbz("");
+ }
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
+ }else {
tjOrderDetail.setYcbz("");
}
} catch (NumberFormatException ignored) {
ignored.printStackTrace();
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
- tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
- }
}else {
+ tjOrderDetail.setYcbz("");
tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
--
Gitblit v1.8.0