From 16bf2151e55c07717bb18a1eb3340aeff18ecf67 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期日, 18 二月 2024 18:04:29 +0800
Subject: [PATCH] zjh 2024/02/18--1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java | 5 ++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 35 +++++++++++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 10 +---------
4 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
index e849ab1..d598083 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
@@ -737,7 +737,10 @@
wqqq.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqqq);
for (TjFlowingWater tjFlowingWater : list1) {
- shouyi.add(tjFlowingWater.getPaidIn());
+ if(null !=tjFlowingWater.getPaidIn()){
+ shouyi.add(tjFlowingWater.getPaidIn());
+ }
+
}
}
chartVo.setBoysNum(boys);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
index 6dcb844..548e140 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -98,14 +98,6 @@
}
tjProject.setAllSonProName(allSonProName.toString()); //2023.2.7 濂楅鍐呮瘡涓�鐖堕」鐩殑瀛愰」鐩瓧绗︿覆
tjProjectList.add(tjProject);
-// LambdaQueryWrapper<TjProConsumables> wrapper1 = new LambdaQueryWrapper<>();
-// wrapper1.eq(TjProConsumables::getProId, packageProject.getProId());
-// List<TjProConsumables> list0 = tjProConsumablesService.list(wrapper1);
-// List<TjConsumables> list1 = new ArrayList<>();
-// for (TjProConsumables tjProConsumables : list0) {
-// list1.add(tjConsumablesService.getById(tjProConsumables.getConsumablesId()));
-// }
-// tjProject.setConsumablesList(list1);
//鐜颁环璧嬪�煎垽鏂璶ull璧嬪師浠� 2023.2.8
if (packageProject.getPriceNow() != null) {
tjProject.setPriceNow(packageProject.getPriceNow());
@@ -118,7 +110,7 @@
}
aPackage.setTjProjectList(tjProjectList);
aPackage.setAllProName(allProName.toString());
- aPackage.setAllSonName(allSonName.toString());
+// aPackage.setAllSonName(allSonName.toString());
StringBuffer a = new StringBuffer();
List<String> b = new ArrayList<>();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index f2b8d65..aeb73ef 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -77,6 +77,41 @@
return AjaxResult.success(maps);
}
+ /**
+ * 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+ */
+ @GetMapping("/getDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getDxList() {
+ LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjProject::getProParentId, 0);
+
+ List<TjProject> tjProjects = tjProjectService.list(wq0);
+
+ //涓婇潰鐨勬崲sql
+// final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
+
+ if (tjProjects != null) {
+ for (TjProject project : tjProjects) {
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+ project.setTjProjectList(projectList);
+
+// SysDept sysDept = deptService.selectDeptById(project.getDeptId());
+// if (sysDept!=null){
+// project.setDeptName(sysDept.getDeptName());
+// }
+ }
+ }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",tjProjects);
+ map.put("key",key);
+ return AjaxResult.success(map);
+ }
+
+
+
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 499bf68..73d6e78 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -209,6 +209,6 @@
"WHERE a.cus_id=#{cusId}) AND b.parent_pro_id=#{proId}) ")
BigDecimal getTbTransitionDxPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
- @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId}")
+ @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId} AND !ISNULL(a.pac_id)")
String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("cardId")String cardId);
}
--
Gitblit v1.8.0