From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 994 ++++++++++++----------------------------------------------
1 files changed, 206 insertions(+), 788 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 4969ee3..677fa58 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -2,11 +2,13 @@
import java.io.*;
import java.math.BigDecimal;
+import java.sql.Struct;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -27,6 +29,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
import com.ltkj.system.service.*;
@@ -178,7 +181,7 @@
ksproList = projectService.getKsTjProjectIdList();
}
- if (ksproList == null || ksproList.size() == 0) {
+ if (ksproList == null || ksproList.isEmpty()) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
List<TjCustomer> customerLis = new ArrayList<>();
@@ -462,382 +465,14 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
-// String userId = SecurityUtils.getLoginUser().getUserId();
-// Integer ksId = null;
-// SysUser sysUser = null;
-// if (null != userId) {
-// sysUser = userService.getById(Long.valueOf(userId));
-// if (null != sysUser) {
-// ksId = Math.toIntExact(sysUser.getDeptId());
-// }
-// }
-// if (ksId == null) {
-// return AjaxResult.error("璇疯緭鍏ョ瀹d");
-// }
- //A30鍖栭獙
- //鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
-// List<Long> postIds = sysUser.getPostIds();
- List<Long> ksproList = null;
-// if (postIds != null) {
-// for (Long postId : postIds) {
-// LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
-// wq111.eq(SysUserPost::getPostId, postId);
-// SysUserPost one = userPostService.getOne(wq111);
-// if (one != null) {
-// SysPost byId = postService.getById(one.getPostId());
-// if (byId.getPostName().equals("褰曞叆鍛�")) {
-// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-// }
-// }
-// }
-// } else {
-// ksproList = projectService.getKsTjProjectIdList();
-// }
-
-// if(sysUser.getUserName().equals("10001")){
- ksproList = projectService.getHuaYanProId();
-// }
-// else {
-// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-// }
-
- if (ksproList == null || ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
- //绛涢�夊寲楠岀殑椤圭洰銆�
-// ksproList = ksproList.stream()
-// .filter(element -> element ==1633660948860522629L)
-// .collect(Collectors.toList());
-
- List<TjCustomer> customerLis = new ArrayList<>();
-
-/* //鏍规嵁浣撴鍙锋煡
- if (null != tjNumber) {
- List<TjOrder> orderList = orderService.getOrderListByLikeTjNum(tjNumber);
- if (null == orderList) {
- return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
- }
- for (TjOrder order : orderList) {
- List<TjOrderDetail> list = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
- if (list.size() == 0) {
- continue;
- }
- LambdaQueryWrapper<TjOrderRemark> wqs = new LambdaQueryWrapper<>();
- wqs.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
- wqs.in(TjOrderRemark::getType, 0,3);
- List<TjOrderRemark> lists = remarkService.list(wqs);
- TjCustomer customer = customerService.getById(order.getUserId());
- //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
- for (TjOrderDetail tjOrderDetail11 : list) {
- customer.setIsPositive(tjOrderDetail11.getIsPositive());
- if (tjOrderDetail11.getIsPositive()==1){
- break;
- }
- }
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- if (null != lists && lists.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : lists) {
- TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
- TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
- if (one.getFlowingWaterId() != null) {
- stringBuilder.append(byId.getProName()).append(";");
- }
-
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- customer.setTjStatus(0L);
- } else {
- customer.setTjStatus(1L);
- customer.setNotCheckeds("鏃�");
- }
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setOrderId(order.getOrderId());
- customer.setIsHz(order.getIsHz());
- customerLis.add(customer);
-
- }
- if (customerLis.size() > 0) {
- List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- Collections.reverse(customerList);
- Map<String, Object> map = new HashMap<>();
- map.put("date", customerList);
- map.put("total", customerLis.size());
- return AjaxResult.success(map);
- } else {
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
- }
-
- //鏍规嵁濮撳悕鏌ヨ
- if (null != name && !"".equals(name)) {
- LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
- wq.like(TjCustomer::getCusName, name);
- List<TjCustomer> list = customerService.list(wq);
- List<TjCustomer> list11111 = new ArrayList<>();
- if (null != list && list.size() > 0) {
- for (TjCustomer customer : list) {
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- List<TjOrder> orderList = orderService.getOrderListByCusId(String.valueOf(customer.getCusId()));
- if (null != orderList && orderList.size() > 0) {
- for (TjOrder order : orderList) {
- List<TjOrderDetail> list111 = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
- if (list111.size() == 0) {
- continue;
- }
- //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
- for (TjOrderDetail tjOrderDetail11 : list111) {
- customer.setIsPositive(tjOrderDetail11.getIsPositive());
- if (tjOrderDetail11.getIsPositive()==1){
- break;
- }
- }
- List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
- if (null != lists && lists.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : lists) {
- TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
- TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
- if (one.getFlowingWaterId() != null) {
- stringBuilder.append(byId.getProName()).append(";");
- }
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
- customer.setTjStatus(0L);
- } else {
- customer.setNotCheckeds("鏃�");
- customer.setTjStatus(1L);
- }
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setOrderId(order.getOrderId());
- customer.setIsHz(order.getIsHz());
- list11111.add(customer);
- }
- }
- }
- if (list11111.size() == 0) {
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
- Map<String, Object> map = new HashMap<>();
- List<TjCustomer> customers = list11111.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- Collections.reverse(customers);
- map.put("customers", customers);
- map.put("total", list11111.size());
- return AjaxResult.success(map);
- } else {
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
- }
- List<TjCustomer> customerLists = null;*/
-// //鏍规嵁浣撴鍙锋煡
-// if (null != tjNumber) {
-// List<TjOrder> orderList = orderService.getOrderListByLikeTjNum(tjNumber);
-// if (null == orderList) {
-// return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
-// }
-// for (TjOrder order : orderList) {
-// List<TjOrderDetail> list = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
-// if (list.size() == 0) {
-// continue;
-// }
-// LambdaQueryWrapper<TjOrderRemark> wqs = new LambdaQueryWrapper<>();
-// wqs.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
-// wqs.in(TjOrderRemark::getType, 0,3);
-// List<TjOrderRemark> lists = remarkService.list(wqs);
-// TjCustomer customer = customerService.getById(order.getUserId());
-//
-// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
-// for (TjOrderDetail tjOrderDetail11 : list) {
-// customer.setIsPositive(tjOrderDetail11.getIsPositive());
-// if (tjOrderDetail11.getIsPositive()==1){
-// break;
-// }
-// }
-//
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// if (null != lists && lists.size() > 0) {
-// StringBuilder stringBuilder = new StringBuilder();
-// for (TjOrderRemark remark : lists) {
-// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
-// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
-// if (one.getFlowingWaterId() != null) {
-// stringBuilder.append(byId.getProName()).append(";");
-// }
-//
-// }
-// customer.setNotCheckeds(String.valueOf(stringBuilder));
-// customer.setTjStatus(0L);
-// } else {
-// customer.setTjStatus(1L);
-// customer.setNotCheckeds("鏃�");
-// }
-// if (order.getTjType().equals("1")) {
-// customer.setTjType("鍥綋");
-// }
-// if (order.getTjType().equals("2")) {
-// customer.setTjType("涓汉");
-// }
-// customer.setTjTime(order.getCreateTime());
-// customer.setTjNumber(order.getTjNumber());
-// customer.setOrderId(order.getOrderId());
-// customer.setIsHz(order.getIsHz());
-// customer.setTjCategory(order.getTjCategory());
-// customerLis.add(customer);
-// }
-// if (customerLis.size() > 0) {
-// List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Collections.reverse(customerList);
-// Map<String, Object> map = new HashMap<>();
-// map.put("date", customerList);
-// map.put("total", customerLis.size());
-// return AjaxResult.success(map);
-// } else {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// }
-//
-// //鏍规嵁濮撳悕鏌ヨ
-// if (null != name && !"".equals(name)) {
-// LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
-// wq.like(TjCustomer::getCusName, name);
-// List<TjCustomer> list = customerService.list(wq);
-// List<TjCustomer> list11111 = new ArrayList<>();
-// if (null != list && list.size() > 0) {
-// for (TjCustomer customer : list) {
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// List<TjOrder> orderList = orderService.getOrderListByCusId(String.valueOf(customer.getCusId()));
-// if (null != orderList && orderList.size() > 0) {
-// for (TjOrder order : orderList) {
-// List<TjOrderDetail> list111 = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
-// if (list111.size() == 0) {
-// continue;
-// }
-// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
-// for (TjOrderDetail tjOrderDetail11 : list111) {
-// customer.setIsPositive(tjOrderDetail11.getIsPositive());
-// if (tjOrderDetail11.getIsPositive()==1){
-// break;
-// }
-// }
-// List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
-// if (null != lists && lists.size() > 0) {
-// StringBuilder stringBuilder = new StringBuilder();
-// for (TjOrderRemark remark : lists) {
-// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
-// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
-// if (one.getFlowingWaterId() != null) {
-// stringBuilder.append(byId.getProName()).append(";");
-// }
-// }
-// customer.setNotCheckeds(String.valueOf(stringBuilder));
-// if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
-// customer.setTjStatus(0L);
-// } else {
-// customer.setNotCheckeds("鏃�");
-// customer.setTjStatus(1L);
-// }
-// if (order.getTjType().equals("1")) {
-// customer.setTjType("鍥綋");
-// }
-// if (order.getTjType().equals("2")) {
-// customer.setTjType("涓汉");
-// }
-// customer.setTjTime(order.getCreateTime());
-// customer.setTjNumber(order.getTjNumber());
-// customer.setOrderId(order.getOrderId());
-// customer.setIsHz(order.getIsHz());
-// customer.setTjCategory(order.getTjCategory());
-// list11111.add(customer);
-// }
-// }
-// }
-// if (list11111.size() == 0) {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// Map<String, Object> map = new HashMap<>();
-// List<TjCustomer> customers = list11111.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Collections.reverse(customers);
-// map.put("customers", customers);
-// map.put("total", list11111.size());
-// return AjaxResult.success(map);
-// } else {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// }
-// List<TjCustomer> customerLists = new ArrayList<>();
-
-// String key="*";
-// if(sysUser.isAdmin()){
-// key="ks"+":*";
-// }else {
-// key="ks:"+ksId+":*";
-// }
-// ScanOptions options = ScanOptions.scanOptions()
-// //杩欓噷鎸囧畾姣忔鎵弿key鐨勬暟閲�(寰堝鍗氬鐬庤瑕佹寚瀹欼nteger.MAX_VALUE锛岃繖鏍风殑璇濊窡 keys鏈変粈涔堝尯鍒紵)
-// .count(10000)
-// .match(key).build();
-// RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
-// 0鏈,1宸叉
Map<String, Object> map = null;
if (type == 0) {
-// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
-// List<TjCustomer> customers = new ArrayList<>();
-// while(cursor.hasNext()){
-// String s = cursor.next().toString();
-// TjCustomer wj = redisCache.getCacheMapValue(s,"0");
-// if(null !=wj){
-// customers.add(wj);
-// }
-// }
-//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
-// cursor.close();
-// customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj");
map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 0, page, pageSize);
-// customerLists = customers;
}
if (type == 1) {
-// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
-// List<TjCustomer> customers = new ArrayList<>();
-// while(cursor.hasNext()){
-// String s = cursor.next().toString();
-// TjCustomer wj = redisCache.getCacheMapValue(s,"1");
-// if(null !=wj){
-// customers.add(wj);
-// }
-// }
-//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
-// cursor.close();
-// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj");
map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 1, page, pageSize);
-// customerLists = customers;
}
-// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
-// AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
-// if (map != null) return map;
return AjaxResult.success(map);
}
@@ -852,245 +487,15 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
-/* String userId = SecurityUtils.getLoginUser().getUserId();
- Integer ksId = null;
- SysUser sysUser = null;
- if (null != userId) {
- sysUser = userService.getById(Long.valueOf(userId));
- if (null != sysUser) {
- ksId = Math.toIntExact(sysUser.getDeptId());
- }
- }
- if (ksId == null) {
- return AjaxResult.error("璇疯緭鍏ョ瀹d");
- }
- //鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
- List<Long> postIds = sysUser.getPostIds();
- List<Long> ksproList = null;
- if (postIds != null) {
- for (Long postId : postIds) {
- LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(SysUserPost::getPostId, postId);
- SysUserPost one = userPostService.getOne(wq111);
- if (one != null) {
- SysPost byId = postService.getById(one.getPostId());
- if (byId.getPostName().equals("褰曞叆鍛�")) {
- ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
- }
- }
- }
- } else {
- ksproList = projectService.getKsTjProjectIdList();
- }
- //绛涢�夊奖鍍忕殑椤圭洰銆� A32褰卞儚
- if (ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
- ksproList = ksproList.stream()
- .filter(element -> element ==1633660948860522589L
-// || element ==1633660948860522504L
-// ||
-// element ==1633660948860522507L|| element ==1633660948860522508L
-// ||
-// element ==1633660948860522515L|| element ==1633660948860522516L
-// ||
-// element ==1633660948860522517L|| element ==1633660948860522519L
-// ||
-// element ==1633660948860522524L|| element ==1633660948860522530L
-// ||
-// element ==1633660948860522531L|| element ==1633660948860522533L
- )
- .collect(Collectors.toList());*/
-
-
-// List<Long> ksproList = projectService.getYingXiangProId();
-// List<TjCustomer> customerLis = new ArrayList<>();
-//
-// //鏍规嵁浣撴鍙锋煡
-// if (null != tjNumber) {
-// List<TjOrder> orderList = orderService.getOrderListByLikeTjNum(tjNumber);
-// if (null == orderList) {
-// return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
-// }
-// for (TjOrder order : orderList) {
-// List<TjOrderDetail> list = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
-// if (list.size() == 0) {
-// continue;
-// }
-// LambdaQueryWrapper<TjOrderRemark> wqs = new LambdaQueryWrapper<>();
-// wqs.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
-// wqs.in(TjOrderRemark::getType, 0,3);
-// List<TjOrderRemark> lists = remarkService.list(wqs);
-// TjCustomer customer = customerService.getById(order.getUserId());
-// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
-// for (TjOrderDetail tjOrderDetail11 : list) {
-// customer.setIsPositive(tjOrderDetail11.getIsPositive());
-// if (tjOrderDetail11.getIsPositive()==1){
-// break;
-// }
-// }
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// if (null != lists && lists.size() > 0) {
-// StringBuilder stringBuilder = new StringBuilder();
-// for (TjOrderRemark remark : lists) {
-// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
-// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
-// if (one.getFlowingWaterId() != null) {
-// stringBuilder.append(byId.getProName()).append(";");
-// }
-//
-// }
-// customer.setNotCheckeds(String.valueOf(stringBuilder));
-// customer.setTjStatus(0L);
-// } else {
-// customer.setTjStatus(1L);
-// customer.setNotCheckeds("鏃�");
-// }
-// if (order.getTjType().equals("1")) {
-// customer.setTjType("鍥綋");
-// }
-// if (order.getTjType().equals("2")) {
-// customer.setTjType("涓汉");
-// }
-// customer.setTjTime(order.getCreateTime());
-// customer.setTjNumber(order.getTjNumber());
-// customer.setOrderId(order.getOrderId());
-// customer.setIsHz(order.getIsHz());
-// customerLis.add(customer);
-//
-// }
-// if (customerLis.size() > 0) {
-// List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Collections.reverse(customerList);
-// Map<String, Object> map = new HashMap<>();
-// map.put("date", customerList);
-// map.put("total", customerLis.size());
-// return AjaxResult.success(map);
-// } else {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// }
-//
-// //鏍规嵁濮撳悕鏌ヨ
-// if (null != name && !"".equals(name)) {
-// LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
-// wq.like(TjCustomer::getCusName, name);
-// List<TjCustomer> list = customerService.list(wq);
-// List<TjCustomer> list11111 = new ArrayList<>();
-// if (null != list && list.size() > 0) {
-// for (TjCustomer customer : list) {
-// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
-// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
-// List<TjOrder> orderList = orderService.getOrderListByCusId(String.valueOf(customer.getCusId()));
-// if (null != orderList && orderList.size() > 0) {
-// for (TjOrder order : orderList) {
-// List<TjOrderDetail> list111 = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
-// if (list111.size() == 0) {
-// continue;
-// }
-// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
-// for (TjOrderDetail tjOrderDetail11 : list111) {
-// customer.setIsPositive(tjOrderDetail11.getIsPositive());
-// if (tjOrderDetail11.getIsPositive()==1){
-// break;
-// }
-// }
-// List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
-// if (null != lists && lists.size() > 0) {
-// StringBuilder stringBuilder = new StringBuilder();
-// for (TjOrderRemark remark : lists) {
-// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
-// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
-// if (one.getFlowingWaterId() != null) {
-// stringBuilder.append(byId.getProName()).append(";");
-// }
-// }
-// customer.setNotCheckeds(String.valueOf(stringBuilder));
-// if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
-// customer.setTjStatus(0L);
-// } else {
-// customer.setNotCheckeds("鏃�");
-// customer.setTjStatus(1L);
-// }
-// if (order.getTjType().equals("1")) {
-// customer.setTjType("鍥綋");
-// }
-// if (order.getTjType().equals("2")) {
-// customer.setTjType("涓汉");
-// }
-// customer.setTjTime(order.getCreateTime());
-// customer.setTjNumber(order.getTjNumber());
-// customer.setOrderId(order.getOrderId());
-// customer.setIsHz(order.getIsHz());
-// list11111.add(customer);
-// }
-// }
-// }
-// if (list11111.size() == 0) {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// Map<String, Object> map = new HashMap<>();
-// List<TjCustomer> customers = list11111.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Collections.reverse(customers);
-// map.put("customers", customers);
-// map.put("total", list11111.size());
-// return AjaxResult.success(map);
-// } else {
-// return AjaxResult.success("鏆傛棤鏁版嵁");
-// }
-// }
-// List<TjCustomer> customerLists = null;
Map<String, Object> map = null;
if (type == 0) {
-// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
-// List<TjCustomer> customers = new ArrayList<>();
-// while(cursor.hasNext()){
-// String s = cursor.next().toString();
-// TjCustomer wj = redisCache.getCacheMapValue(s,"0");
-// if(null !=wj){
-// customers.add(wj);
-// }
-// }
-//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
-// cursor.close();
-// customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj");
map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 0, page, pageSize);
-// customerLists = customers;
}
if (type == 1) {
-// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
-// List<TjCustomer> customers = new ArrayList<>();
-// while(cursor.hasNext()){
-// String s = cursor.next().toString();
-// TjCustomer wj = redisCache.getCacheMapValue(s,"1");
-// if(null !=wj){
-// customers.add(wj);
-// }
-// }
-//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
-// cursor.close();
-// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj");
map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 1, page, pageSize);
-// customerLists = customers;
}
-// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
-// if (customerLists.size() > 0) {
-// Collections.reverse(customerLists);
-// List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Map<String, Object> map = new HashMap<>();
-// map.put("date", customerList);
-// map.put("total", customerLists.size());
-// return AjaxResult.success(map);
-// } else {
-// AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
-// if (map != null) return map;
-// return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
return AjaxResult.success(map);
-// }
}
@@ -1102,23 +507,11 @@
@ApiParam(value = "骞撮緞鍗曚綅") @RequestParam String patagename,
@ApiParam(value = "鐢熸棩)") @RequestParam Date patbirth) {
- String format = DateUtil.format(patbirth, "yyyy.MM.dd");
List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname, sex, null);
return AjaxResult.success(tjYxjcList);
}
-
-// @GetMapping("/getSsTjYxjcList")
-// @ApiOperation("鏌ヨ涓汉褰卞搷妫�鏌ラ」鐩粨鏋滈泦(鎼滅礌鐢�)")
-// public AjaxResult getSsTjYxjcList(@ApiParam(value = "濮撳悕") @RequestParam String patname,
-// @ApiParam(value = "鎬у埆") @RequestParam String sex,
-// @ApiParam(value = "骞撮緞") @RequestParam String patage) {
-//
-//
-// List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null,null);
-// return AjaxResult.success(tjYxjcList);
-// }
/**
@@ -1129,7 +522,6 @@
*/
@GetMapping("/getHistory")
@ApiOperation("鏌ヨ瀹㈡埛浣撴鍘嗗彶璁板綍")
- //@PreAuthorize("@ss.hasPermi('system:dept:getHistory')")
public AjaxResult getHistory(@RequestParam @ApiParam(value = "浣撴瀹㈡埛id") Long cusId) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
Integer ksId = null;
@@ -1329,92 +721,94 @@
@ApiOperation("鎻愪氦璇ョ瀹や笅瀹㈡埛浣撴缁撴灉鎺ュ彛")
@Transactional
public AjaxResult addRemark(@ApiParam(value = "浣撴鐖堕」鐩娉ㄩ泦鍚�") @RequestBody List<TjOrderRemark> remarklList) {
- Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
- SysUser sysUser = userService.getById(userId);
- if (remarklList == null || remarklList.isEmpty()) {
- return AjaxResult.success("鎿嶄綔澶辫触");
- }
- for (TjOrderRemark orderRemark : remarklList) {
- List<String> summaryList = orderRemark.getSummaryList();
- if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
- orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- } else {
- orderRemark.setSummary(null);
+ try {
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ if (remarklList == null || remarklList.isEmpty()) {
+ return AjaxResult.success("鎿嶄綔澶辫触");
}
- if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
- LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
- qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
- TjOrder order = orderService.getOne(qw);
- orderRemark.setDeptId(sysUser.getDeptId());
- if (orderRemark.getDoctorName() == null) {
- orderRemark.setDoctorName(String.valueOf(sysUser.getUserId()));
- }
- List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();
-
- final TjCustomer byId1 = customerService.getById(order.getUserId());
- if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
- //----------------------------------start
-// for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
-// final TjProject byId = projectService.getById(tjOrderDetail.getProId());
-// //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
-// if (tjOrderDetail.getRulesList()!=null){
-// for (TjRules tjRules : tjOrderDetail.getRulesList()) {
-// TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
-// orderDetailRules.setAid(tjRules.getAid());
-// if (byId1!=null){
-// orderDetailRules.setCusName(byId1.getCusName());
-// orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
-// orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
-// orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
-// }
-// orderDetailRules.setBingzhong(tjRules.getBingzhong());
-// orderDetailRules.setDoctorName(sysUser.getNickName());
-// orderDetailRules.setTjNumber(order.getTjNumber());
-// if (byId!=null){
-// orderDetailRules.setProId(String.valueOf(byId.getProId()));
-// orderDetailRules.setProName(byId.getProName());
-// }
-// orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
-// tjOrderDetailRulesService.save(orderDetailRules);
-// }
-// }
-// }
- asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order);
- LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
- qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
- qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
- TjOrderDetail detail = detailService.getOne(qww);
- detail.setTjStatus(1L);
- detailService.updateById(detail);
- orderRemark.setType(1);
- LambdaQueryWrapper<TjOrderRemark> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrderRemark::getTjNumber, orderRemark.getTjNumber());
- wq1.eq(TjOrderRemark::getProId, orderRemark.getProId());
- TjOrderRemark one = remarkService.getOne(wq1);
- if (one == null) {
- TjOrderRemark remark = new TjOrderRemark();
- BeanUtils.copyBeanProp(orderRemark, remark);
- remarkService.save(remark);
+ for (TjOrderRemark orderRemark : remarklList) {
+ List<String> summaryList = orderRemark.getSummaryList();
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
+ orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
} else {
- one.setRemark(orderRemark.getRemark());
- if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
- one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
- } else {
- one.setSummary(null);
- }
- one.setDoctorName(orderRemark.getDoctorName());
- one.setType(1);
- remarkService.updateById(one);
+ orderRemark.setSummary(null);
}
- asyncService.updateCheckType(orderRemark.getTjNumber());
- asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
+ TjOrder order = orderService.getOrderByTjNum(orderRemark.getTjNumber());
+ if(null !=order && null !=order.getReportTime())return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鍑� 涓嶅彲淇敼");
+ orderRemark.setDeptId(sysUser.getDeptId());
+ if (orderRemark.getDoctorName() == null) {
+ orderRemark.setDoctorName(String.valueOf(sysUser.getUserId()));
+ }
+ List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();
+
+ // final TjCustomer byId1 = customerService.getById(order.getUserId());
+ if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
+ //----------------------------------start
+ // for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
+ // final TjProject byId = projectService.getById(tjOrderDetail.getProId());
+ // //缁欑梾绉嶈褰曡〃瀛� 鏂逛究缁熻鐥呯鍜屽鎴蜂俊鎭箣闂寸殑鍏崇郴
+ // if (tjOrderDetail.getRulesList()!=null){
+ // for (TjRules tjRules : tjOrderDetail.getRulesList()) {
+ // TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
+ // orderDetailRules.setAid(tjRules.getAid());
+ // if (byId1!=null){
+ // orderDetailRules.setCusName(byId1.getCusName());
+ // orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
+ // orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
+ // orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
+ // }
+ // orderDetailRules.setBingzhong(tjRules.getBingzhong());
+ // orderDetailRules.setDoctorName(sysUser.getNickName());
+ // orderDetailRules.setTjNumber(order.getTjNumber());
+ // if (byId!=null){
+ // orderDetailRules.setProId(String.valueOf(byId.getProId()));
+ // orderDetailRules.setProName(byId.getProName());
+ // }
+ // orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
+ // tjOrderDetailRulesService.save(orderDetailRules);
+ // }
+ // }
+ // }
+ asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
+ LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
+ qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
+ TjOrderDetail detail = detailService.getOne(qww);
+ detail.setTjStatus(1L);
+ detailService.updateById(detail);
+ orderRemark.setType(1);
+ LambdaQueryWrapper<TjOrderRemark> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrderRemark::getTjNumber, orderRemark.getTjNumber());
+ wq1.eq(TjOrderRemark::getProId, orderRemark.getProId());
+ TjOrderRemark one = remarkService.getOne(wq1);
+ if (one == null) {
+ TjOrderRemark remark = new TjOrderRemark();
+ BeanUtils.copyBeanProp(orderRemark, remark);
+ remarkService.save(remark);
+ } else {
+ one.setRemark(orderRemark.getRemark());
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
+ one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
+ } else {
+ one.setSummary(null);
+ }
+ one.setDoctorName(orderRemark.getDoctorName());
+ one.setType(1);
+ remarkService.updateById(one);
+ }
+ asyncService.updateCheckType(orderRemark.getTjNumber());
+ asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
}
-// asyncService.updateCheckType(orderRemark.getTjNumber());
-// asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
+ remarkService.tjYishengjianchajianyi(null, null, null, null);
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ } catch (NumberFormatException e) {
+ log.error(e.getMessage());
+ throw new RuntimeException(e);
}
- remarkService.tjYishengjianchajianyi(null, null, null, null);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
@@ -1426,8 +820,12 @@
// @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
- public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+// 淇敼鎸夌収绉戝鏌ヨ
+ public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber,
+ @ApiParam(value = "宸叉鏈鐘舵�� 0 鏈 1宸叉") @RequestParam(required = false) Integer type) {
+ if(type == null)type= 0;
String userId = SecurityUtils.getLoginUser().getUserId();
+ log.info("褰撳墠鐧诲綍鐢ㄦ埛ID ->{}",userId);
Integer ksId = null;
SysUser sysUser = null;
if (null != userId) {
@@ -1443,58 +841,54 @@
if (null == tjOrder) {
return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
}
- LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
- TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
- if (null != tjFlowingWater) {
- if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
- if (configByKey.equals("Y")) {
- HashMap<String, Object> hisRequestParams = new HashMap<>();
- // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
- hisRequestParams.put("patientId", tjOrder.getCardId());
- log.info("ltkj--- " + DateUtil.date() + "鎿嶄綔浜篿d: " + userId + "鎿嶄綔绉戝: " + sysUser.getDeptId() + "鎿嶄綔鐨勪綋妫�浜�: " + tjNumber);
- AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
- if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
- int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
- if (sfsf > 0) {
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
- return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+
+ SysDept dept = deptService.getById(ksId);
+
+ if(type !=1){
+ if(null !=dept && !dept.getDeptName().contains("浣撴涓績")){
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
+ if (null != tjFlowingWater) {
+ if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
+ if (configByKey.equals("Y")) {
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
+ hisRequestParams.put("patientId", tjOrder.getCardId());
+ log.info("ltkj--- " + DateUtil.date() + "鎿嶄綔浜篿d: " + userId + "鎿嶄綔绉戝: " + sysUser.getDeptId() + "鎿嶄綔鐨勪綋妫�浜�: " + tjNumber);
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
+ int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId());
+ if (sfsf > 0 || sfsf1 > 0) {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+ }
+ extracted(tjOrder, tjFlowingWater);
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
+ }
}
- extracted(tjOrder, tjFlowingWater);
- } else {
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
- return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈鎺is鎺ュ彛 " + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
-// String s = configService.selectConfigByKey("is_request_common_his_api");
-// if (null != s && s.equals("Y")) {
-// LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
-// wrapper1.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
-// wrapper1.eq(TjFlowingWater::getPayStasus, 0L);
-// List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
-// if (!list.isEmpty()) {
-// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
-// }
-// }
}
- } else {
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈鎺is鎺ュ彛 " + " 浣撴鍙� " + tjOrder.getTjNumber());
- return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
String config = configService.selectConfigByKey("qt_open_xdt");
String byKey = configService.selectConfigByKey("qt_kjksid");
- List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
+ Set<Integer> split = new HashSet<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
+ split.add(ksId);
if ("Y".equals(config)) {
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (null != roles && !roles.isEmpty()) {
List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
if (!list.isEmpty()) {
-// if (null != ksId && ksId == 100) {
-// ksId = 999;
-// }
if (null != byKey && !byKey.isEmpty()) {
String[] arr = byKey.split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
for (String s : arr) {
@@ -1502,37 +896,26 @@
split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
}
}
- } else {
- split.add(ksId);
}
- } else {
- split.add(ksId);
}
- } else {
- split.add(ksId);
}
-
-// LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
-// if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
-// wq2.in(TjProject::getDeptId,split);
-// }
-// //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
-// wq2.eq(TjProject::getNeedReport,"Y");
-// List<TjProject> Deptlist = projectService.list(wq2);
-// List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
-// if (Deptlist.isEmpty() || proIdList.isEmpty()) {
-// return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
-// }
-
-
+ log.info("type ->{},鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",type,split);
List<TjOrderRemark> list;
if(null != sysUser && sysUser.getUserName().equals("10001")){
- list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ if(type !=1){
+ list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ }else {
+ list=remarkService.yiShengJianChaYjGetPrentProCJGLY(tjNumber);
+ }
}else {
- list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
+ if(type !=1){
+ list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
+ }else {
+ list= remarkService.yiShengJianChaYjGetPrentPro(tjNumber, split);
+ }
}
-
if (null ==list || list.isEmpty()) {
+ log.info("瑙﹀彂璇ョ瀹や笅鏃犻」鐩�");
return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
}
for (TjOrderRemark tjOrderRemark : list) {
@@ -1541,39 +924,7 @@
tjOrderRemark.setProName(tjProject.getProName());
}
}
-
return AjaxResult.success(list);
-
-
-// LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
-// wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
-// wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
-// wqq.in(TjOrderDetail::getProId, proIdList);
-// wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
-// List<TjOrderDetail> detailList = detailService.list(wqq);
-// if (detailList != null && !detailList.isEmpty()) {
-// List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
-// QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
-// wq.eq("tj_number", tjNumber);
-// wq.in("pro_id", collect);
-// wq.ne("type", 2);
-// wq.ne("dept_id",241);
-// wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
-// List<TjOrderRemark> list = remarkService.list(wq);
-// if (list.isEmpty()) {
-// return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
-// }
-// for (TjOrderRemark tjOrderRemark : list) {
-// TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
-// if (null != tjProject) {
-// tjOrderRemark.setProName(tjProject.getProName());
-// }
-// }
-// return AjaxResult.success(list);
-// }
-// return AjaxResult.success();
-// }
-
}
@Transactional
@@ -1638,6 +989,7 @@
List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
tjOrderDetail.setRulesList(rulesList);
tjOrderDetail.setProject(project);
+ tjOrderDetail.setResultType(project.getResultType());
if (null != remark.getDoctorName()) {
SysUser byId = userService.getById(remark.getDoctorName());
if (byId != null) {
@@ -1784,4 +1136,70 @@
return success(depts);
}
+ @GetMapping("/getxmjgz")
+ @ApiOperation(value = "鍖荤敓妫�鏌ュ鑾峰彇椤圭洰瑙勫垯鍊�")
+ public AjaxResult getxmjgz(@RequestParam String proId,@RequestParam(required = false) String xmgz) {
+ LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjRules::getProId, proId);
+ if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz);
+ List<TjRules> list = tjRulesService.list(wq);
+ if(null !=list && !list.isEmpty()){
+ for (TjRules tjRules : list) {
+ if(null !=tjRules){
+ tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(),""));
+ }
+ }
+ }
+ return AjaxResult.success(list);
+ }
+
+
+ @GetMapping ("/ysjcbGetProByTjNumAndOrderId")
+ @ApiOperation (value = "鍖荤敓妫�鏌ラ〉闈㈡煡璇㈡楠屾鏌ラ」鐩帴鍙�")
+ public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
+// List<CsProVo> list = new ArrayList<>();
+// if (null != orderRemarkList && orderRemarkList.size() > 0) {
+// for (TjOrderRemark remark : orderRemarkList) {
+// CsProVo vo = new CsProVo();
+// vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName());
+// vo.setProName(projectService.getById(remark.getProId()).getProName());
+// vo.setType(remark.getType());
+// if (null != remark.getDoctorName()) {
+// vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
+// vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName());
+// }
+// vo.setSffs("缁熸敹");
+// vo.setIsPay("宸叉敹璐�");
+// vo.setQdcreateTime(remark.getCreateTime());
+// vo.setBcupdateTime(remark.getUpdateTime());
+// vo.setZhupdateTime(remark.getUpdateTime());
+// list.add(vo);
+// }
+// List<CsProVo> list1 = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+// Collections.sort(list, new Comparator<CsProVo>() {
+// @Override
+// public int compare(CsProVo o1, CsProVo o2) {
+// return o1.getType() - o2.getType();
+// }
+// });
+// }
+
+ List<CsProVo> list = getysjcProVos(tjNumber);
+ return AjaxResult.success(list);
+ }
+
+ public List<CsProVo> getysjcProVos(String tjNumber) {
+ List<CsProVo> list = remarkService.ysjcGetProByTjNumAndOrderId(tjNumber);
+ if (null != list && !list.isEmpty()) {
+ list.sort(new Comparator<CsProVo>() {
+ @Override
+ public int compare(CsProVo o1, CsProVo o2) {
+ return o1.getType() - o2.getType();
+ }
+ });
+ }
+ return list;
+ }
+
}
--
Gitblit v1.8.0