From e72583cdcc3300dd922480594ff630b867c3a846 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 16 八月 2024 18:04:25 +0800
Subject: [PATCH] zjh 2024-08-16
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 77 +++-----------------------------------
1 files changed, 7 insertions(+), 70 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 8df6e9a..1778e4e 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
@@ -1322,7 +1322,10 @@
List<String> summaryList = orderRemark.getSummaryList();
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);
@@ -1380,8 +1383,9 @@
one.setRemark(orderRemark.getRemark());
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);
@@ -1579,17 +1583,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);
List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);
- if (null == proParentList || proParentList.size()==0) {
+ 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)));
@@ -1605,73 +1603,17 @@
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());
@@ -1686,11 +1628,6 @@
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);
--
Gitblit v1.8.0