From a2d12d52275c9fc34277d3e41c662a5ea9fb597f Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 10:11:44 +0800
Subject: [PATCH] 报告合并判断心电图和附件
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 114 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 24 deletions(-)
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 da0b331..6dcb844 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
@@ -138,7 +138,7 @@
}
final MallCategory byId = mallCategoryService.getById(aPackage.getCategoryId());
- if (byId!=null){
+ if (byId != null) {
aPackage.setCategoryNames(byId.getName());
}
}
@@ -152,35 +152,93 @@
@GetMapping("getList")
@ApiOperation(value = "鏌ヨ浣撴濂楅鍒楄〃")
public TableDataInfo getList(@RequestParam(required = false) @ApiParam(value = "鎬у埆") String cusSex) {
- List<TjPackage> tjPackageList = null;
- List<TjPackage> list = null;
- if (cusSex == null || cusSex.equals("2")) {
- if (redisCache.hasKey("getTjPackageListBySex")) {
- list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByManAndWoMan");
- } else {
- tjPackageList = tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0));
+// List<TjPackage> tjPackageList = null;
+// List<TjPackage> list = null;
+// if (cusSex == null || cusSex.equals("2")) {
+// if (redisCache.hasKey("getTjPackageListBySex")) {
+// list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByManAndWoMan");
+// } else {
+// tjPackageList = tjPackageService.list(new LambdaQueryWrapper<TjPackage>().eq(TjPackage::getPacStatus,0));
+// }
+// } else {
+// if (cusSex.equals("0")) {
+// if (redisCache.hasKey("getTjPackageListBySex")) {
+// list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByMan");
+// } else {
+// tjPackageList = tjPackageService.getTjPackageListByMan();
+// }
+// } else {
+// if (redisCache.hasKey("getTjPackageListBySex")) {
+// list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByWoMan");
+// } else {
+// tjPackageList = tjPackageService.getTjPackageListByWoMan();
+// }
+// }
+// }
+// asyncService.getTjPackageList();
+// if (null != list && list.size() > 0) {
+// return getDataTable(list);
+// } else {
+// getTjPackageList(tjPackageList);
+// return getDataTable(tjPackageList);
+// }
+ String pacName="";
+ if (cusSex==null || cusSex.equals("2")) {
+ final List<TjPackage> pacListBySqlAndAll = tjPackageService.getPacListBySqlAndAll(pacName);
+ if (pacListBySqlAndAll!=null){
+ for (TjPackage tjPackage : pacListBySqlAndAll) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ final List<TjPackageProject> list = ppservice.list(wqq);
+ if (list!=null){
+ for (TjPackageProject tjPackageProject : list) {
+ final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
+ res.add(byId);
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
}
+ return getDataTable(pacListBySqlAndAll);
} else {
if (cusSex.equals("0")) {
- if (redisCache.hasKey("getTjPackageListBySex")) {
- list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByMan");
- } else {
- tjPackageList = tjPackageService.getTjPackageListByMan();
+ final List<TjPackage> pacListBySqlAndMan = tjPackageService.getPacListBySqlAndMan(pacName);
+ if (pacListBySqlAndMan!=null){
+ for (TjPackage tjPackage : pacListBySqlAndMan) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ final List<TjPackageProject> list = ppservice.list(wqq);
+ if (list!=null){
+ for (TjPackageProject tjPackageProject : list) {
+ final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
+ res.add(byId);
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
}
- } else {
- if (redisCache.hasKey("getTjPackageListBySex")) {
- list = redisCache.getCacheMapValue("getTjPackageListBySex", "getTjPackageListByWoMan");
- } else {
- tjPackageList = tjPackageService.getTjPackageListByWoMan();
+ return getDataTable(pacListBySqlAndMan);
+ }else {
+ final List<TjPackage> pacListBySqlAndWomen = tjPackageService.getPacListBySqlAndWomen(pacName);
+ if (pacListBySqlAndWomen!=null){
+ for (TjPackage tjPackage : pacListBySqlAndWomen) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ final List<TjPackageProject> list = ppservice.list(wqq);
+ if (list!=null){
+ for (TjPackageProject tjPackageProject : list) {
+ final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
+ res.add(byId);
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
}
+ return getDataTable(pacListBySqlAndWomen);
}
- }
- asyncService.getTjPackageList();
- if (null != list && list.size() > 0) {
- return getDataTable(list);
- } else {
- getTjPackageList(tjPackageList);
- return getDataTable(tjPackageList);
}
}
@@ -297,6 +355,14 @@
}
tjpp.setProId(tjProject.getProId());
tjpp.setPacId(tjPackage.getPacId());
+ //鍒ゆ柇褰撳墠濂楅涓嬫湁娌℃湁杩欎釜椤圭洰 鏈夌殑璇濊烦杩囨坊鍔�
+ LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
+ wqq.eq(TjPackageProject::getProId,tjProject.getProId());
+ final TjPackageProject one = ppservice.getOne(wqq);
+ if (one!=null){
+ continue;
+ }
ppservice.save(tjpp);
if (null != tjProject.getPriceNow()) {
money = money.add(tjProject.getPriceNow());
--
Gitblit v1.8.0