From bd6c1c1c6642d57c85816a62d77c25c4e1a66a76 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 一月 2024 09:38:46 +0800
Subject: [PATCH] zjh 2024/01/02--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 115 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 53 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 96f1748..b3a2371 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
@@ -12,6 +13,7 @@
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
@@ -37,6 +39,7 @@
import java.util.stream.Collectors;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
+import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;
/**
* @Author: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃/璧典匠璞�
@@ -200,12 +203,12 @@
// return getResult(page, pageSize, orderList, customerList, map);
// }
String value = String.valueOf(compId);
- if(tjNumber==null)tjNumber="";
- if(compId==null)value="";
- if(name==null)name="";
- if(beginTime==null)beginTime="";
- if(endTime==null)endTime="";
- return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
+ if (tjNumber == null) tjNumber = "";
+ if (compId == null) value = "";
+ if (name == null) name = "";
+ if (beginTime == null) beginTime = "";
+ if (endTime == null) endTime = "";
+ return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
}
@@ -243,15 +246,15 @@
// });
// }
- List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
- if(null !=list && list.size()>0){
- list.sort(new Comparator<CsProVo>() {
- @Override
- public int compare(CsProVo o1, CsProVo o2) {
- return o1.getType() - o2.getType();
- }
- });
- }
+ List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+ if (null != list && list.size() > 0) {
+ list.sort(new Comparator<CsProVo>() {
+ @Override
+ public int compare(CsProVo o1, CsProVo o2) {
+ return o1.getType() - o2.getType();
+ }
+ });
+ }
return AjaxResult.success(list);
}
@@ -270,13 +273,11 @@
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = orderService.getOne(wq1);
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
if (null != tjOrder) {
tjOrder.setConfirmTime(new DateTime());
tjOrder.setConfirmDoctor(sysUser.getNickName());
- tjOrder.setConfirmStatus(remark);
+ tjOrder.setConfirmStatus(String.valueOf(status));
if (status == 0) {
tjOrder.setStatus(TjConstants.TJ_CHECK);
asyncService.updateCheckType(tjNumber);
@@ -306,38 +307,43 @@
*/
@GetMapping("/dataSynchronization")
@ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
+ @RepeatSubmit
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
if ("Y".equals(getInfoFromSqlData)) {
- List<LtkjHysqd> one = testMapper.getHysqdByTmh(tjNumber);
- if (one != null) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjHysqdService.saveBatch(one);
- DynamicDataSourceContextHolder.clearDataSourceType();
- for (LtkjHysqd ltkjHysqd : one) {
- List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
- if (one1 != null) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjHybgdService.saveBatch(one1);
- DynamicDataSourceContextHolder.clearDataSourceType();
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if (null != order) {
+ List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
+ if (one != null && one.size() > 0) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHysqdService.saveBatch(one);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ for (LtkjHysqd ltkjHysqd : one) {
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
+ if (one1 != null && one1.size() > 0) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHybgdService.saveBatch(one1);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
}
}
- }
- List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
- if (one2 != null) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjExamJcsqdService.saveBatch(one2);
- DynamicDataSourceContextHolder.clearDataSourceType();
- for (LtkjExamJcsqd ltkjExamJcsqd : one2) {
- List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(ltkjExamJcsqd.getTmh());
- if (one3 != null) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjExamJcbgdService.saveBatch(one3);
- DynamicDataSourceContextHolder.clearDataSourceType();
- }
- }
+// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
+// if (one2 != null && one2.size() > 0) {
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// ltkjExamJcsqdService.saveBatch(one2);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// for (LtkjExamJcsqd ltkjExamJcsqd : one2) {
+// List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(ltkjExamJcsqd.getTmh());
+// if (one3 != null && one3.size() > 0) {
+// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// ltkjExamJcbgdService.saveBatch(one3);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+// }
+// }
+// }
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),UserHoder.getLoginUser().getUserId());
}
}
return AjaxResult.success("鍚屾鎴愬姛");
@@ -358,8 +364,7 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
@ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
-
-// String config = configService.selectConfigByKey("tj_confirm");
+ // String config = configService.selectConfigByKey("tj_confirm");
// DateTime beginTimes = null;
// DateTime endTimes = null;
// if (null != beginTime && null != endTime) {
@@ -449,12 +454,12 @@
// return getResult(page, pageSize, orderList, customerList, map);
// }
String value = String.valueOf(compId);
- if(tjNumber==null)tjNumber="";
- if(compId==null)value="";
- if(name==null)name="";
- if(beginTime==null)beginTime="";
- if(endTime==null)endTime="";
- return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
+ if (tjNumber == null) tjNumber = "";
+ if (compId == null) value = "";
+ if (name == null) name = "";
+ if (beginTime == null) beginTime = "";
+ if (endTime == null) endTime = "";
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
}
/**
@@ -494,6 +499,7 @@
if (customerService.updateById(customer)) {
LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
+ wqq.eq(TbTransition::getCardId, customer.getCardId());
transitionService.remove(wqq);
asyncService.updateCheckType(tjNumber);
return AjaxResult.success("鎿嶄綔鎴愬姛");
@@ -543,6 +549,10 @@
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
TjProject project = projectService.selectTjProjectByProId(remark.getProId());
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ if ("N".equals(project.getNeedReport())) {
+ continue;
+ }
if (null != project) {
parent.put("parent", project.getProName());
parent.put("parentId", project.getProId().toString());
@@ -590,7 +600,6 @@
} else {
return AjaxResult.success("璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁");
}
-// }
}
return AjaxResult.success(list);
}
--
Gitblit v1.8.0