From abe349a1a71b5d583c9f19a557ca0756772ce861 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 29 二月 2024 16:56:26 +0800
Subject: [PATCH] zjh 本地 2024/02/29 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 27 ++++++---------------------
3 files changed, 9 insertions(+), 24 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 3da76a3..2eec84e 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
@@ -1366,7 +1366,7 @@
if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
}
- one.setDeptId(orderRemark.getDeptId());
+// one.setDeptId(orderRemark.getDeptId());
one.setDoctorName(orderRemark.getDoctorName());
one.setType(1);
remarkService.updateById(one);
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..17d78d5 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,7 @@
} else {
parent.put("parentAdvice", null);
}
- parent.put("sons", tjOrderDetails);
+ 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());
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index d6ec36f..e1ce9e8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -68,7 +68,7 @@
@Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.tj_number=#{tjNumber}" +
- " AND a.type =1 AND a.deleted=0 AND b.need_report='N' AND b.deleted=0")
+ " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257) ")//and a.dept_id in (269,270,253,254,255,257)
List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
@@ -105,7 +105,7 @@
"\tLEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" +
"\tLEFT JOIN sys_user us ON us.user_id = re.doctor_name \n" +
"WHERE\n" +
- "\tre.type != 2 and pro.need_report='Y' \n" +
+ "\tre.type != 2 \n" +//and pro.need_report='Y'
"\tAND re.tj_number =#{tjNumber}")
List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber);
--
Gitblit v1.8.0