From b6f742f5fd549231c46cccd11647946422a6e93a Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 05 三月 2024 18:53:33 +0800
Subject: [PATCH] zjh 本地 2024/03/5 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 8ce2102..5877bb7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -561,12 +561,10 @@
continue;
}
-
//鍒ゆ柇璇ラ」鐩槸鍚︽楠岀椤圭洰 2024/2/28g
if (project.getDeptId() == 241) {
continue;
}
-
if (null != project) {
parent.put("parent", project.getProName());
@@ -638,38 +636,25 @@
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
- TjCustomer customer = customerService.getById(one.getUserId());
+// TjCustomer customer = customerService.getById(one.getUserId());
List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanTable(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
if (null != remarkList && remarkList.size() > 0) {
for (TjOrderRemark remark : remarkList) {
+
Map<String, Object> parent = new HashMap<>();
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
-
+ List<TjOrderDetail> dels=new ArrayList<>();
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
- if (null == byId) {
- detailService.removeById(tjOrderDetail.getOrderDetailId());
- } else {
- tjOrderDetail.setProject(byId);
- }
- List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
- if (list2.size() == 0) {
- tjOrderDetail.setStandard(new TjStandard());
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
- TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
- tjOrderDetail.setStandard(tjStandard1);
+ if(remark.getProId().equals(tjOrderDetail.getProId())){
+ dels.add(tjOrderDetail);
}
}
-
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
@@ -677,7 +662,10 @@
} else {
parent.put("parentAdvice", null);
}
- parent.put("sons", tjOrderDetails);
+ if(dels.size()==0){
+ continue;
+ }
+ parent.put("sons", dels);
parent.put("remark", remark.getRemark());
if (remark.getDoctorName() != null && null != userService.getById(remark.getDoctorName())) {
parent.put("doctorName", userService.getById(remark.getDoctorName()).getNickName());
--
Gitblit v1.8.0