From e44fea2d4845aed7848f163152da532f19ccce41 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 06 十二月 2023 18:03:49 +0800
Subject: [PATCH] 1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
index 3e7091b..da91fa0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -6,21 +6,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.config.MatchUtils;
-import com.ltkj.hosp.domain.TjAskHistorys;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.service.ITjAskHistorysService;
-import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.val;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
-import com.ltkj.hosp.domain.TjAskMedicalHistory;
-import com.ltkj.hosp.service.ITjAskMedicalHistoryService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
@@ -43,11 +41,15 @@
@Resource
private ITjCustomerService tjCustomerService;
+ @Autowired
+ private ITjAskWorkLogService tjAskWorkLogService;
+ @Autowired
+ private ITjHarmTypeLogService tjHarmTypeLogService;
+
/**
* 鏌ヨ闂瘖鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:list')")
@GetMapping("/list")
public TableDataInfo list(TjAskMedicalHistory tjAskMedicalHistory) {
startPage();
@@ -58,7 +60,6 @@
/**
* 瀵煎嚭闂瘖鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:export')")
@Log(title = "闂瘖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TjAskMedicalHistory tjAskMedicalHistory) {
@@ -70,7 +71,6 @@
/**
* 鑾峰彇闂瘖璇︾粏淇℃伅
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:query')")
@GetMapping(value = "/{askId}")
public AjaxResult getInfo(@PathVariable("askId") Long askId) {
return success(tjAskMedicalHistoryService.selectTjAskMedicalHistoryByAskId(askId));
@@ -103,11 +103,26 @@
/**
* 鏂板闂瘖
*/
- //@PreAuthorize("@ss.hasPermi('hosp:history:add')")
+ @Transactional
@Log(title = "闂瘖", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
- return toAjax(tjAskMedicalHistoryService.insertTjAskMedicalHistory(tjAskMedicalHistory));
+ tjAskMedicalHistoryService.insertTjAskMedicalHistory(tjAskMedicalHistory);
+ final List<TjAskWorkLog> workLogs = tjAskMedicalHistory.getWorkLogs();
+ for (TjAskWorkLog workLog : workLogs) {
+ final boolean save = tjAskWorkLogService.save(workLog);
+ if (!save){
+ return AjaxResult.error();
+ }
+ List<TjHarmTypeLog> harmTypeLogs = workLog.getHarmTypeLogs();
+ for (TjHarmTypeLog harmTypeLog : harmTypeLogs) {
+ final boolean save1 = tjHarmTypeLogService.save(harmTypeLog);
+ if (!save1){
+ return AjaxResult.error();
+ }
+ }
+ }
+ return AjaxResult.success();
}
@@ -115,9 +130,9 @@
* pc绔慨鏀归棶璇�
*/
@ApiOperation(value = "pc绔慨鏀归棶璇�")
- //@PreAuthorize("@ss.hasPermi('hosp:history:edit')")
@Log(title = "闂瘖", businessType = BusinessType.UPDATE)
@PutMapping
+ @Transactional
public AjaxResult edit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
boolean b =false;
tjAskMedicalHistory.setFromBy("PC绔�");
@@ -133,6 +148,21 @@
for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
boolean b1 = historysService.saveOrUpdate(tjAskHistorys);
+ if (!b1){
+ return AjaxResult.error();
+ }
+ }
+ }
+
+ List<TjAskWorkLog> askWorkLogs = tjAskMedicalHistory.getWorkLogs();
+ if (askWorkLogs!=null&&askWorkLogs.size()>0){
+ for (TjAskWorkLog askWorkLog : askWorkLogs) {
+ askWorkLog.setAskId(tjAskMedicalHistory.getAskId());
+ boolean b1 = tjAskWorkLogService.saveOrUpdate(askWorkLog);
+ List<TjHarmTypeLog> harmTypeLogs = askWorkLog.getHarmTypeLogs();
+ for (TjHarmTypeLog harmTypeLog : harmTypeLogs) {
+ tjHarmTypeLogService.saveOrUpdate(harmTypeLog);
+ }
if (!b1){
return AjaxResult.error();
}
@@ -208,7 +238,6 @@
/**
* 鍒犻櫎闂瘖
*/
-// @PreAuthorize("@ss.hasPermi('hosp:history:remove')")
@Log(title = "闂瘖", businessType = BusinessType.DELETE)
@DeleteMapping("/{askIds}")
public AjaxResult remove(@PathVariable Long[] askIds) {
--
Gitblit v1.8.0