From 894b091f0e9b6b501e408885ce28f6a391e43d7c Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期六, 09 十二月 2023 18:42:13 +0800
Subject: [PATCH] 2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java | 72 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java
index f4ffd0a..7b3d645 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxTjAskMedicalHistoryController.java
@@ -10,6 +10,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -67,7 +68,7 @@
if (order != null) {
LambdaQueryWrapper<TjAskMedicalHistory> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjAskMedicalHistory::getCusId, order.getTjNumber());
+ wq1.eq(TjAskMedicalHistory::getTjNum, order.getTjNumber());
TjAskMedicalHistory one = tjAskMedicalHistoryService.getOne(wq1);
if (one != null) {
one.setTjCategory(order.getTjCategory());
@@ -112,10 +113,11 @@
}
/**
- * 灏忕▼搴忎慨鏀归棶璇�
+ * 灏忕▼搴忔柊澧炰慨鏀归棶璇�
*/
@ApiOperation(value = "灏忕▼搴忕鏂板闂瘖璁板綍淇℃伅鎺ュ彛")
@PostMapping("/appEdit")
+ @Transactional
public AjaxResult appEdit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
LambdaQueryWrapper<TjAskMedicalHistory> wq = new LambdaQueryWrapper<>();
wq.eq(TjAskMedicalHistory::getTjNum, tjAskMedicalHistory.getTjNum());
@@ -130,13 +132,14 @@
for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
if (!historysService.save(tjAskHistorys)) {
- return AjaxResult.error();
+ return AjaxResult.error("娣诲姞澶辫触");
}
}
//娣诲姞鑱屼笟鐥呭彶
final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
if (workLogs != null) {
for (TjAskWorkLog workLog : workLogs) {
+ workLog.setAskId(tjAskMedicalHistory.getAskId());
workLog.setCusId(tjAskMedicalHistory.getCusId());
workLog.setCusName(tjAskMedicalHistory.getCusName());
workLog.setTjNumber(tjAskMedicalHistory.getTjNum());
@@ -157,7 +160,7 @@
log.setWorkId(workLog.getId());
final boolean b = tjHarmTypeLogService.save(log);
if (!b) {
- return AjaxResult.error();
+ return AjaxResult.error("娣诲姞澶辫触");
}
}
}
@@ -168,6 +171,21 @@
return AjaxResult.success("娣诲姞鎴愬姛!");
}
}else {
+ //鏂板淇敼娌￠棶棰� 杩欏潡鐗垫壇鍒犻櫎 娌℃湁鏇村ソ鐨勫姙娉� 鎵�浠ラ噰鍙栧厛鍒犲悗鍔�
+ //鍒犻櫎鍘熸潵鐨勮亴涓氬拰鐥呭彶
+ LambdaQueryWrapper<TjAskWorkLog> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjAskWorkLog::getTjNumber, tjAskMedicalHistory.getTjNum());
+ tjAskWorkLogService.remove(wq1);
+ //鍒犻櫎鍘熸潵鐨勭梾鍙�
+ LambdaQueryWrapper<TjAskHistorys> wq2 = new LambdaQueryWrapper<>();
+ wq2.eq(TjAskHistorys::getAskId, one.getAskId());
+ historysService.remove(wq2);
+ //鍒犻櫎鍘熸潵鐨勭梾鍙�
+ LambdaQueryWrapper<TjHarmTypeLog> wq3 = new LambdaQueryWrapper<>();
+ wq3.eq(TjHarmTypeLog::getTjNumber, tjAskMedicalHistory.getTjNum());
+ tjHarmTypeLogService.remove(wq3);
+
+
tjAskMedicalHistory.setFromBy("灏忕▼搴忕");
tjAskMedicalHistory.setUpdateId(String.valueOf(UserHoder.getWxuser().getId()));
if (tjAskMedicalHistoryService.updateById(tjAskMedicalHistory)) {
@@ -176,21 +194,43 @@
//淇敼鐥呭彶
for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
- if (!historysService.updateById(tjAskHistorys)) {
- return AjaxResult.error();
+ if (!historysService.save(tjAskHistorys)) {
+ return AjaxResult.error("娣诲姞澶辫触");
}
+// if (tjAskHistorys.getDiseaseId()==null){
+// if (!historysService.save(tjAskHistorys)) {
+// return AjaxResult.error("娣诲姞澶辫触");
+// }
+// }else {
+// if (!historysService.updateById(tjAskHistorys)) {
+// return AjaxResult.error("淇敼澶辫触");
+// }
+// }
+
}
//淇敼鑱屼笟鐥呭彶
final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
if (workLogs != null) {
for (TjAskWorkLog workLog : workLogs) {
+ workLog.setAskId(tjAskMedicalHistory.getAskId());
workLog.setCusId(tjAskMedicalHistory.getCusId());
workLog.setCusName(tjAskMedicalHistory.getCusName());
workLog.setTjNumber(tjAskMedicalHistory.getTjNum());
- final boolean save = tjAskWorkLogService.updateById(workLog);
+ final boolean save = tjAskWorkLogService.save(workLog);
if (!save) {
- return AjaxResult.error();
+ return AjaxResult.error("娣诲姞澶辫触");
}
+// if (workLog.getId()==null){
+// final boolean save = tjAskWorkLogService.save(workLog);
+// if (!save) {
+// return AjaxResult.error("娣诲姞澶辫触");
+// }
+// }else {
+// final boolean save = tjAskWorkLogService.updateById(workLog);
+// if (!save) {
+// return AjaxResult.error("淇敼澶辫触");
+// }
+// }
List<String> harmTypeLogs = workLog.getHarmTypeLogs();
if (harmTypeLogs != null) {
for (String harmTypeLog : harmTypeLogs) {
@@ -202,10 +242,22 @@
log.setCusName(tjAskMedicalHistory.getCusName());
log.setTjNumber(tjAskMedicalHistory.getTjNum());
log.setWorkId(workLog.getId());
- final boolean b = tjHarmTypeLogService.updateById(log);
+ final boolean b = tjHarmTypeLogService.save(log);
if (!b) {
- return AjaxResult.error();
+ return AjaxResult.error("娣诲姞澶辫触");
}
+// if (log.getId()==null){
+// final boolean b = tjHarmTypeLogService.save(log);
+// if (!b) {
+// return AjaxResult.error("娣诲姞澶辫触");
+// }
+// }else {
+// final boolean b = tjHarmTypeLogService.updateById(log);
+// if (!b) {
+// return AjaxResult.error("淇敼澶辫触");
+// }
+// }
+
}
}
}
--
Gitblit v1.8.0