From 1d5eb9bd21333ce57f71857203acb3a2f774a831 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 19 七月 2024 18:14:30 +0800
Subject: [PATCH] 报告存储代码从pdf工具类转移到接口
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 90 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 45 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 a7a40fe..7f20eda 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
@@ -1426,9 +1426,9 @@
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);
+// 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());
@@ -1630,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());
--
Gitblit v1.8.0