From dc23d54849571d2bd38f6f8e1dfdb849047532f6 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 06 三月 2024 11:43:50 +0800
Subject: [PATCH] zjh 本地 2024/03/6 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 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..74c5d82 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
@@ -317,7 +317,12 @@
List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
if (one != null && one.size() > 0) {
for (LtkjHysqd ltkjHysqd : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// LambdaQueryWrapper<LtkjHysqd> wq0=new LambdaQueryWrapper<>();
+// wq0.eq(LtkjHysqd::getTjh,ltkjHysqd.getTjh());
+// wq0.eq(LtkjHysqd::getTmh,ltkjHysqd.getTmh());
+// ltkjHysqdService.remove(wq0);
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
if (hysqd == null) {
ltkjHysqdService.save(ltkjHysqd);
@@ -561,12 +566,10 @@
continue;
}
-
//鍒ゆ柇璇ラ」鐩槸鍚︽楠岀椤圭洰 2024/2/28g
if (project.getDeptId() == 241) {
continue;
}
-
if (null != project) {
parent.put("parent", project.getProName());
@@ -638,38 +641,28 @@
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())){
+ if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+ }
+ dels.add(tjOrderDetail);
}
}
-
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
@@ -677,7 +670,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