From 4dc5a1ece2a58f768dea5c829bff9da842a6de95 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期六, 15 六月 2024 15:02:22 +0800
Subject: [PATCH] zjh 本地 2024/06/15 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 4 ++--
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java | 6 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 7 ++++---
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 3e4454b..ea5b23b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -161,7 +161,7 @@
}else {
detailsDto.setSfzhfy("0");
}
- detailsDto.setSl(1);
+ detailsDto.setSl(project.getSl());
detailsDtos.add(detailsDto);
}
}
@@ -254,7 +254,7 @@
}else {
detailsDto.setSfzhfy("0");
}
- detailsDto.setSl(1);
+ detailsDto.setSl(project.getSl());
detailsDtoss.add(detailsDto);
}
@@ -338,6 +338,7 @@
wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
wq.groupBy(TjProject::getHisXmbm);
wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
+ wq.isNull(TjProject::getDeptId);
List<TjProject> projects = projectService.list(wq);
if (null != projects && projects.size() > 0) {
for (TjProject project : projects) {
@@ -350,7 +351,7 @@
} else {
detailsDto.setSfzhfy("0");
}
- detailsDto.setSl(1);
+ detailsDto.setSl(project.getSl());
detailDtos.add(detailsDto);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index a720dbe..756bb53 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1686,7 +1686,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1740,7 +1740,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
index 88a567b..45806dc 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
@@ -259,6 +259,12 @@
@ApiModelProperty(value = "鏄惁缁勫悎璐圭敤")
private String sfzhfy;
+ @ApiModelProperty(value = "his鍗曚环")
+ private BigDecimal hisdj;
+
+ @ApiModelProperty(value = "鏁伴噺")
+ private Integer sl;
+
/**
* 瀛愰」鐩�
*/
--
Gitblit v1.8.0