From 201e9ae76d2c8d6219ceabbf4e1ebb36fc2e7a06 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 11 七月 2024 18:18:23 +0800
Subject: [PATCH] zjh 2024/07/11-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 195 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 148 insertions(+), 47 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 72c779d..4b21bf8 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,12 +1,18 @@
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;
@@ -14,6 +20,7 @@
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;
@@ -23,6 +30,7 @@
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
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;
@@ -101,6 +109,12 @@
private TestMapper testMapper;
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private ITjFlowingWaterService tjFlowingWaterService;
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
+ @Autowired
+ private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
/**
* 璇ヤ綋妫�绉戝涓嬪鎴峰垪琛ㄦ樉绀烘帴鍙�
@@ -1386,6 +1400,7 @@
* @param tjNumber
* @return
*/
+ @Transactional
@GetMapping("/getParentList")
@ApiOperation(value = "鍖荤敓鐐瑰嚮浣撴淇℃伅璇︽儏(鍙樉绀虹埗椤圭洰鍒楄〃)")
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
@@ -1399,18 +1414,99 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (configByKey.equals("Y")){
+ // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
+ LambdaQueryWrapper<TjOrder> tjOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderLambdaQueryWrapper.eq(TjOrder::getTjNumber,tjNumber);
+ TjOrder tjOrder = orderService.getOne(tjOrderLambdaQueryWrapper);
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
+// if (tjFlowingWater1.getPayStasus() != 1){
+ LambdaQueryWrapper<TjCustomer> tjCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjCustomerLambdaQueryWrapper.eq(TjCustomer::getCusId,tjOrder.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(tjCustomerLambdaQueryWrapper);
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
+// hisRequestParams.put("card_no",tjCustomer.getCusIdcard());
+ hisRequestParams.put("patientId",tjOrder.getCardId());
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+// ArrayList<String> sqdhs = new ArrayList<>();
+// ArrayList<String> xmfls = new ArrayList<>();
+ BigDecimal cateFeeAll = BigDecimal.ZERO;
+ for (Map<String, String> datum : data) {
+// String advId = datum.get("Adv_Id").split("_")[1];
+ BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+// String cateCode = datum.get("CateCode");
+ cateFeeAll = cateFeeAll.add(cateFee);
+// sqdhs.add(advId);
+// xmfls.add(cateCode);
+ }
+ /* LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
+ .in(LtkjJianchajianyanTree::getXmfl, xmfls)
+ .eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
+ .groupBy(LtkjJianchajianyanTree::getType)
+ .select(LtkjJianchajianyanTree::getFyhj);
+ List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
+ BigDecimal total = results.stream()
+ .map(item -> new BigDecimal(item.getFyhj()))
+ .reduce(BigDecimal.ZERO, BigDecimal::add);*/
+ BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
+ if (cateFeeAll.compareTo(fyhj) != 0){
+ return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+ }
+ 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);
+ }else {
+ 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){
- ksId=271;
+ 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")) {
@@ -1430,7 +1526,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");
@@ -1493,7 +1589,10 @@
// }
TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+
+// List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
+
if (null == proParentList || proParentList.size()==0) {
Map<String, Object> map = new HashMap<>();
map.put("xiaoJieIds", null);
@@ -1508,6 +1607,7 @@
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) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -1530,50 +1630,50 @@
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()));
- }
- }
+// 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);
- }
- }
+// 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());
@@ -1583,6 +1683,7 @@
} else {
tjOrderDetail.setDoctorName(null);
}
+ tjOrderDetailList.add(tjOrderDetail);
}
}
Map<String, Object> map = new HashMap<>();
@@ -1602,7 +1703,7 @@
} else {
map.put("xiaoJieIds", null);
}
- map.put("sons", tjOrderDetails);
+ map.put("sons", tjOrderDetailList);
map.put("xiaoJie", adviceList);
map.put("remark", remark.getRemark());
--
Gitblit v1.8.0