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/SysDeptController.java | 891 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 619 insertions(+), 272 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 7399842..5e547ac 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
@@ -1,30 +1,40 @@
package com.ltkj.web.controller.system;
import java.io.*;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
+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.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
+import com.ltkj.common.core.domain.TreeSelect;
+import com.ltkj.common.core.domain.entity.SysRole;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.core.text.Convert;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
-import com.ltkj.system.service.ISysPostService;
-import com.ltkj.system.service.ISysUserPostService;
-import com.ltkj.system.service.ISysUserService;
+import com.ltkj.system.service.*;
+import com.ltkj.web.controller.his.HisApiGetMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.ibatis.jdbc.Null;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +54,6 @@
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.common.utils.StringUtils;
-import com.ltkj.system.service.ISysDeptService;
import javax.annotation.Resource;
@@ -56,6 +65,7 @@
@RestController
@RequestMapping("/system/dept")
@Api(tags = "绉戝閮ㄩ棬淇℃伅")
+@Slf4j
public class SysDeptController extends BaseController implements Serializable {
@Resource
private ISysDeptService deptService;
@@ -97,7 +107,16 @@
private ITjRulesService tjRulesService;
@Autowired
public RedisTemplate<Object,Object> redisTemplate;
-
+ @Resource
+ private TestMapper testMapper;
+ @Autowired
+ private ISysConfigService configService;
+ @Autowired
+ private ITjFlowingWaterService tjFlowingWaterService;
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
+ @Autowired
+ private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
/**
* 璇ヤ綋妫�绉戝涓嬪鎴峰垪琛ㄦ樉绀烘帴鍙�
@@ -391,7 +410,9 @@
StringBuilder stringBuilder = new StringBuilder();
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
- stringBuilder.append(byId.getProName()).append(";");
+ if(null !=byId){
+ stringBuilder.append(byId.getProName()).append(";");
+ }
}
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
@@ -422,47 +443,57 @@
@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");
- }
+// 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> 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 (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());
+// 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) {
@@ -598,17 +629,197 @@
return AjaxResult.success("鏆傛棤鏁版嵁");
}
}
- List<TjCustomer> customerLists = null;
+ 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("鏆傛椂娌℃湁鏁版嵁");
+// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
+// AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
+// if (map != null) return map;
+ return AjaxResult.success(map);
}
@@ -622,7 +833,7 @@
@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();
+/* String userId = SecurityUtils.getLoginUser().getUserId();
Integer ksId = null;
SysUser sysUser = null;
if (null != userId) {
@@ -653,7 +864,7 @@
} else {
ksproList = projectService.getKsTjProjectIdList();
}
- //绛涢�夊奖鍍忕殑椤圭洰銆�
+ //绛涢�夊奖鍍忕殑椤圭洰銆� A32褰卞儚
if (ksproList.size() == 0) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
@@ -671,151 +882,181 @@
// ||
// element ==1633660948860522531L|| element ==1633660948860522533L
)
- .collect(Collectors.toList());
- List<TjCustomer> customerLis = new ArrayList<>();
+ .collect(Collectors.toList());*/
- //鏍规嵁浣撴鍙锋煡
- 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;
+// 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) {
@@ -826,11 +1067,39 @@
// 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("鏆傛椂娌℃湁鏁版嵁");
+// AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
+// if (map != null) return map;
+// return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
+ return AjaxResult.success(map);
// }
}
+
+
+ @GetMapping("/getTjYxjcList")
+ @ApiOperation("鏌ヨ涓汉褰卞搷妫�鏌ラ」鐩粨鏋滈泦")
+ public AjaxResult getTjYxjcList(@ApiParam(value = "濮撳悕") @RequestParam String patname,
+ @ApiParam(value = "鎬у埆") @RequestParam String sex,
+ @ApiParam(value = "骞撮緞") @RequestParam String patage,
+ @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);
+// }
@@ -983,6 +1252,10 @@
return toAjax(deptService.insertDept(dept));
}
+
+ @Resource
+ private IDictHospService dictHospService;
+
/**
* 淇敼绉戝閮ㄩ棬
*/
@@ -1001,6 +1274,16 @@
return error("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
}
dept.setUpdateBy(getUsername());
+
+ //鏌ヨ闄㈠尯鍚嶅瓧璧嬪��
+ if (dept.getHospId()!=null){
+ final DictHosp byId = dictHospService.getById(dept.getHospId());
+ if (byId!=null){
+ dept.setHospName(byId.getHospAreaName());
+ }
+ }
+
+
return toAjax(deptService.updateDept(dept));
}
@@ -1032,14 +1315,17 @@
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.size() == 0) {
+ if (remarklList == null || remarklList.isEmpty()) {
return AjaxResult.success("鎿嶄綔澶辫触");
}
for (TjOrderRemark orderRemark : remarklList) {
List<String> summaryList = orderRemark.getSummaryList();
- if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null) ) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null) ) {
orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
+ }else {
+ orderRemark.setSummary(null);
}
+ if(StringUtils.isBlank(orderRemark.getRemark()))orderRemark.setRemark(null);
LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
TjOrder order = orderService.getOne(qw);
@@ -1050,7 +1336,7 @@
List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();
final TjCustomer byId1 = customerService.getById(order.getUserId());
- if (null != tjOrderDetailList && tjOrderDetailList.size() > 0) {
+ if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
//----------------------------------start
for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
final TjProject byId = projectService.getById(tjOrderDetail.getProId());
@@ -1095,10 +1381,11 @@
remarkService.save(remark);
} else {
one.setRemark(orderRemark.getRemark());
- if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
+ if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
+ }else {
+ one.setSummary(null);
}
- one.setDeptId(orderRemark.getDeptId());
one.setDoctorName(orderRemark.getDoctorName());
one.setType(1);
remarkService.updateById(one);
@@ -1119,6 +1406,7 @@
* @param tjNumber
* @return
*/
+// @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
@@ -1132,6 +1420,65 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
+ if(null !=tjFlowingWater && (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("瀛樺湪鏈即璐归」鐩�");
+ }
+ 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 config = configService.selectConfigByKey("qt_open_xdt");
+ String byKey = configService.selectConfigByKey("qt_kjksid");
+ List<Integer> split = new ArrayList<>(); // 瀛樻斁杞崲鍚庣殑integer绫诲瀷缁撴灉
+ if("Y".equals(config)){
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ if(null !=roles && roles.size()>0){
+ List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
+ if(list.size()>0){
+ if(null !=ksId && ksId==100){
+ ksId=999;
+ }
+ if(null !=byKey && !"".equals(byKey)){
+ String[] arr = byKey.split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
+ for (String s : arr) {
+ int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
+ split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
+ }
+ }
+ }else {
+ split.add(ksId);
+ }
+ }else {
+ split.add(ksId);
+ }
+ }else {
+ split.add(ksId);
+ }
+
//鍒ゆ柇褰撳墠鐧婚檰鐨勪汉鏄笉鏄鐞嗗憳銆傜鐞嗗憳鍙互鐪嬪綋鍓嶄綋妫�鍙蜂笅鎵�鏈夐」鐩�
// if (sysUser.getUserName().equals("10001")) {
// QueryWrapper<TjOrderRemark> wqq = new QueryWrapper<>();
@@ -1150,7 +1497,7 @@
// }
LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
- wq2.eq(TjProject::getDeptId, ksId);
+ wq2.in(TjProject::getDeptId,split);
}
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
wq2.eq(TjProject::getNeedReport,"Y");
@@ -1167,6 +1514,7 @@
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.size() > 0) {
List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
@@ -1174,6 +1522,8 @@
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.size() == 0) {
return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");
@@ -1191,6 +1541,23 @@
return AjaxResult.error();
}
+ @Transactional
+ public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ }
+
/**
* 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
*
@@ -1204,14 +1571,11 @@
return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
}
-// if(redisCache.hasHKey("getOrderDetailByProParentId"+tjNumber,proParentId)){
-// Map<String, Object> mapValue = redisCache.getCacheMapValue("getOrderDetailByProParentId" + tjNumber, proParentId);
-// return AjaxResult.success(mapValue);
-// }
-
TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
- if (null == proParentList || proParentList.size()==0) {
+
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
+
+ if (null == proParentList || proParentList.isEmpty()) {
Map<String, Object> map = new HashMap<>();
map.put("xiaoJieIds", null);
map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId,proParentId)));
@@ -1225,74 +1589,19 @@
return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
}
List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
+ List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
TjCustomer customer = tjCustomerService.getById(one.getUserId());
- if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject project = projectService.getById(tjOrderDetail.getProId());
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
if ("N".equals(project.getNeedReport())){
continue;
}
- //鐥呯鍥炴樉
-// LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
-// wq.eq(TjOrderDetailRules::getProId,project.getProId());
-// wq.eq(TjOrderDetailRules::getTjNumber,tjNumber);
-// List<TjOrderDetailRules> list = tjOrderDetailRulesService.list(wq);
-// List<TjRules> res=new ArrayList<>();
-// for (TjOrderDetailRules orderDetailRules : list) {
-// final TjRules byId = tjRulesService.getById(orderDetailRules.getAid());
-// res.add(byId);
-// }
List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
tjOrderDetail.setRulesList(rulesList);
-
- //鏌ユ爣鍑嗗拰鍗曚綅----start
- List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
- if (list26.size() == 0) {
- project.setProMetering("/");
- project.setProScope("/");
- } else if (list26.size() == 1) {
- project.setProMetering(list26.get(0).getCompany() == null ? " " : list26.get(0).getCompany());
- project.setProScope((list26.get(0).getTjStandardLtValue() == null ? " " : list26.get(0).getTjStandardLtValue()) + "-" + (list26.get(0).getTjStandardGtValue() == null ? " " : list26.get(0).getTjStandardGtValue()));
- } else {
- Long cusSex = customer.getCusSex();
- Date cusBrithday = customer.getCusBrithday();
- int age = DateUtil.ageOfNow(cusBrithday);
- for (TjStandard tjStandard : list26) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, cusSex);
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
- }
- TjStandard standard = tjStandardService.getOne(wq8);
- project.setProMetering(standard.getCompany());
- project.setProScope((standard.getTjStandardLtValue() == null ? " " : standard.getTjStandardLtValue()) + "-" + (standard.getTjStandardGtValue() == null ? " " : standard.getTjStandardGtValue()));
- }
- }
- //鏌ユ爣鍑嗗拰鍗曚綅-----end
tjOrderDetail.setProject(project);
- List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(project.getProId()));
- if (list2.size() == 0) {
- tjOrderDetail.setStandard(null);
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- for (TjStandard tjStandard : list2) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, customer.getCusSex());
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
- }
- TjStandard standard = tjStandardService.getOne(wq8);
- tjOrderDetail.setStandard(standard);
- }
- }
if (null != remark.getDoctorName()) {
- //lg0412
SysUser byId = userService.getById(remark.getDoctorName());
if (byId != null) {
tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
@@ -1300,17 +1609,13 @@
} else {
tjOrderDetail.setDoctorName(null);
}
+ tjOrderDetailList.add(tjOrderDetail);
}
}
Map<String, Object> map = new HashMap<>();
List<TjAdvice> adviceList = new ArrayList<>();
if (null != remark) {
String[] strings = StringUtils.split(remark.getSummary(), ";");
-// if (null != strings && strings.length > 0) {
-// for (String string : strings) {
-// adviceList.add(tjAdviceService.getById(string));
-// }
-// }
if(null !=strings && strings.length>0){
List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
adviceList.addAll(list);
@@ -1319,7 +1624,7 @@
} else {
map.put("xiaoJieIds", null);
}
- map.put("sons", tjOrderDetails);
+ map.put("sons", tjOrderDetailList);
map.put("xiaoJie", adviceList);
map.put("remark", remark.getRemark());
@@ -1356,22 +1661,56 @@
/**
* 鏍规嵁椤圭洰id鑾峰彇寤鸿
*/
- @GetMapping("/getDeptAdvice/{proId}")
+ @GetMapping("/getDeptAdvice")
@ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
- public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @PathVariable String proId) {
- List<TjAdvice> list = new ArrayList<>();
+ public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
+ @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
+ @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
+ @ApiParam(value = "椤电爜") @RequestParam(defaultValue ="1") int page,
+ @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue ="10") int pageSize) {
LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjAdvice::getProId, proId);
- List<TjAdvice> list1 = tjAdviceService.list(wq1);
- //濡傛灉娌℃湁椤圭洰id 灏辫繑鍥炴墍鏈夌殑寤鸿闆嗗悎
- if (list1.size() == 0) {
- return AjaxResult.success(tjAdviceService.list());
+ if(null !=proId){
+ wq1.eq(TjAdvice::getProId, proId);
}
- for (TjAdvice tjAdvice : list1) {
- list.add(tjAdvice);
+ if(null !=nr && !nr.isEmpty()){
+ wq1.like(TjAdvice::getTitle,nr);
+ }else if (null !=pym && !pym.isEmpty()){
+ wq1.like(TjAdvice::getTitle,pym);
+ }
+// else {
+// wq1.last("limit 20");
+// }
+ Page<TjAdvice> pages=new Page<>(page,pageSize);
+ Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",advicePage.getRecords());
+ map.put("total",advicePage.getTotal());
+// List<TjAdvice> list = tjAdviceService.list(wq1);
+ return AjaxResult.success(map);
+ }
+
+
+
+
+ @GetMapping("/getAdviceByTjNumAndPro")
+ @ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
+ public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getProId, proId);
+ wq.eq(TjOrderRemark::getTjNumber,tjNum);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ List<TjAdvice> list =null;
+ if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if(null !=strings && strings.length>0){
+ list = tjAdviceService.getAdviceStringByIds(strings);
+ }
}
return AjaxResult.success(list);
}
+
+
/**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
@@ -1384,6 +1723,14 @@
}
+ @GetMapping("/deptTree111")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
+ public AjaxResult deptTree111(SysDept dept) {
+ final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
+ return success(treeSelects);
+ }
+
+
/**
* 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
*/
--
Gitblit v1.8.0