From ccbcd23becc1359f26d8cc571005e546e2ed6053 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 22 五月 2024 17:59:39 +0800
Subject: [PATCH] zjh 2024/05/22-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 76 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 39 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..f94d1cf 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
@@ -269,7 +269,7 @@
@ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
@ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("璇峰厛鍚屾浣撴椤圭洰!");
+ if (num > 0) return AjaxResult.error("璇锋鏌ユ槸鍚﹀瓨鍦ㄦ湭妫�鎴栧欢鏈熼」鐩�");
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -314,23 +314,7 @@
if ("Y".equals(getInfoFromSqlData)) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
- List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
- if (one != null && one.size() > 0) {
- for (LtkjHysqd ltkjHysqd : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
- if (hysqd == null) {
- ltkjHysqdService.save(ltkjHysqd);
- DynamicDataSourceContextHolder.clearDataSourceType();
- List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
- if (one1 != null && one1.size() > 0) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjHybgdService.saveBatch(one1);
- DynamicDataSourceContextHolder.clearDataSourceType();
- }
- }
- }
- }
+ tbhyxm(order);
// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
// if (one2 != null && one2.size() > 0) {
@@ -354,6 +338,27 @@
}
}
return AjaxResult.success("鍚屾鎴愬姛");
+ }
+
+ private void tbhyxm(TjOrder order) {
+ List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
+ if (one != null && one.size() > 0) {
+ for (LtkjHysqd ltkjHysqd : one) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
+ LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ if (hysqd == null) {
+ ltkjHysqdService.save(ltkjHysqd);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
+ if (one1 != null && one1.size() > 0) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHybgdService.saveBatch(one1);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ }
+ }
+ }
}
@@ -460,6 +465,7 @@
// }
// return getResult(page, pageSize, orderList, customerList, map);
// }
+
String value = String.valueOf(compId);
if (tjNumber == null) tjNumber = "";
if (compId == null) value = "";
@@ -561,12 +567,10 @@
continue;
}
-
//鍒ゆ柇璇ラ」鐩槸鍚︽楠岀椤圭洰 2024/2/28g
if (project.getDeptId() == 241) {
continue;
}
-
if (null != project) {
parent.put("parent", project.getProName());
@@ -638,38 +642,29 @@
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
- TjCustomer customer = customerService.getById(one.getUserId());
+ tbhyxm(one);
+// 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 +672,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