From 1755b1e774b784a3ed15d9df730ac977461a0e69 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 13 五月 2025 15:53:47 +0800
Subject: [PATCH] 2025-05-13-2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java | 130 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 125 insertions(+), 5 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 5d27952..2105291 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
@@ -5,10 +5,14 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.web.controller.dto.PutAskMedicalHistoryDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.val;
@@ -191,11 +195,82 @@
/**
* pc绔慨鏀归棶璇�
*/
+// @ApiOperation(value = "pc绔慨鏀归棶璇�")
+// @Log(title = "闂瘖", businessType = BusinessType.UPDATE)
+// @PutMapping
+// @Transactional
+// public AjaxResult edit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
+// LambdaQueryWrapper<TjAskWorkLog> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjAskWorkLog::getTjNumber, tjAskMedicalHistory.getTjNum());
+// tjAskWorkLogService.remove(wq);
+// LambdaQueryWrapper<TjHarmTypeLog> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjHarmTypeLog::getTjNumber, tjAskMedicalHistory.getTjNum());
+// tjHarmTypeLogService.remove(wq1);
+//
+//
+// boolean b = false;
+// tjAskMedicalHistory.setFromBy("PC绔�");
+// if (tjAskMedicalHistory.getAskId() != null) {
+// b = tjAskMedicalHistoryService.updateById(tjAskMedicalHistory);
+// } else {
+// b = tjAskMedicalHistoryService.save(tjAskMedicalHistory);
+// }
+// if (b) {
+// List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
+// if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
+// 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.setCusId(tjAskMedicalHistory.getCusId());
+// askWorkLog.setCusName(tjAskMedicalHistory.getCusName());
+// askWorkLog.setTjNumber(tjAskMedicalHistory.getTjNum());
+// askWorkLog.setAskId(tjAskMedicalHistory.getAskId());
+// boolean b1 = tjAskWorkLogService.saveOrUpdate(askWorkLog);
+// List<String> harmTypeLogs = askWorkLog.getHarmTypeLogs();
+// if (harmTypeLogs != null) {
+// for (String harmTypeLog : harmTypeLogs) {
+// final TjHarmType byId = tjHarmTypeService.getById(harmTypeLog);
+// if (byId != null) {
+// TjHarmTypeLog log = new TjHarmTypeLog();
+// log.setAid(byId.getAid());
+// log.setCusId(tjAskMedicalHistory.getCusId());
+// log.setCusName(tjAskMedicalHistory.getCusName());
+// log.setTjNumber(tjAskMedicalHistory.getTjNum());
+// log.setWorkId(askWorkLog.getId());
+// tjHarmTypeLogService.save(log);
+// }
+// }
+// }
+// if (!b1) {
+// return AjaxResult.error();
+// }
+// }
+// }
+// return AjaxResult.success(tjAskMedicalHistory);
+// }
+// return AjaxResult.error();
+// //return toAjax(tjAskMedicalHistoryService.updateTjAskMedicalHistory(tjAskMedicalHistory));
+// }
+
+ /**
+ * pc绔慨鏀归棶璇�
+ */
@ApiOperation(value = "pc绔慨鏀归棶璇�")
@Log(title = "闂瘖", businessType = BusinessType.UPDATE)
@PutMapping
@Transactional
- public AjaxResult edit(@RequestBody TjAskMedicalHistory tjAskMedicalHistory) {
+ public AjaxResult edit(@RequestBody PutAskMedicalHistoryDto askMedicalHistoryDto) {
+ TjAskMedicalHistory tjAskMedicalHistory = new TjAskMedicalHistory();
+ BeanUtil.copyProperties(askMedicalHistoryDto,tjAskMedicalHistory,true);
LambdaQueryWrapper<TjAskWorkLog> wq = new LambdaQueryWrapper<>();
wq.eq(TjAskWorkLog::getTjNumber, tjAskMedicalHistory.getTjNum());
tjAskWorkLogService.remove(wq);
@@ -206,6 +281,19 @@
boolean b = false;
tjAskMedicalHistory.setFromBy("PC绔�");
+
+ JSONArray medicalHistory = askMedicalHistoryDto.getMedicalHistory();
+ String medicalHistoryTxt = medicalHistory.stream().map(item -> {
+ JSONObject entries = (JSONObject) item;
+ return entries.getStr("icdname");
+ }).collect(Collectors.joining(","));
+ String medicalHistoryIds = medicalHistory.stream().map(item -> {
+ JSONObject entries = (JSONObject) item;
+ return entries.getStr("id");
+ }).collect(Collectors.joining(","));
+ tjAskMedicalHistory.setMedicalHistoryIds(medicalHistoryIds);
+ tjAskMedicalHistory.setMedicalHistory(medicalHistoryTxt);
+
if (tjAskMedicalHistory.getAskId() != null) {
b = tjAskMedicalHistoryService.updateById(tjAskMedicalHistory);
} else {
@@ -213,9 +301,22 @@
}
if (b) {
List<TjAskHistorys> tjAskHistorysList = tjAskMedicalHistory.getTjAskHistorysList();
- if (tjAskHistorysList != null && tjAskHistorysList.size() > 0) {
+ if (tjAskHistorysList != null && !tjAskHistorysList.isEmpty()) {
for (TjAskHistorys tjAskHistorys : tjAskMedicalHistory.getTjAskHistorysList()) {
tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
+ tjAskHistorys.setDataType(1);
+ boolean b1 = historysService.saveOrUpdate(tjAskHistorys);
+ if (!b1) {
+ return AjaxResult.error();
+ }
+ }
+ }
+
+ List<TjAskHistorys> zhiyezzList = askMedicalHistoryDto.getZhiyezzList();
+ if (zhiyezzList != null && !zhiyezzList.isEmpty()) {
+ for (TjAskHistorys tjAskHistorys : zhiyezzList) {
+ tjAskHistorys.setAskId(tjAskMedicalHistory.getAskId());
+ tjAskHistorys.setDataType(2);
boolean b1 = historysService.saveOrUpdate(tjAskHistorys);
if (!b1) {
return AjaxResult.error();
@@ -224,7 +325,7 @@
}
List<TjAskWorkLog> askWorkLogs = tjAskMedicalHistory.getWorkLogs();
- if (askWorkLogs != null && askWorkLogs.size() > 0) {
+ if (askWorkLogs != null && !askWorkLogs.isEmpty()) {
for (TjAskWorkLog askWorkLog : askWorkLogs) {
askWorkLog.setCusId(tjAskMedicalHistory.getCusId());
askWorkLog.setCusName(tjAskMedicalHistory.getCusName());
@@ -254,9 +355,17 @@
return AjaxResult.success(tjAskMedicalHistory);
}
return AjaxResult.error();
- //return toAjax(tjAskMedicalHistoryService.updateTjAskMedicalHistory(tjAskMedicalHistory));
}
+ /**
+ * 鍒犻櫎鐥呭彶鎴栫棁鐘�
+ * @param historyId
+ * @return
+ */
+ @PostMapping("/removeAskHistorys")
+ public AjaxResult removeAskHistorys(@RequestBody List<String > historyId){
+ return toAjax(historysService.removeByIds(historyId));
+ }
/**
* 灏忕▼搴忔牴鎹鎴疯韩浠借瘉鍙疯幏鍙栭棶璇婅缁嗕俊鎭�
@@ -288,9 +397,20 @@
LambdaQueryWrapper<TjAskHistorys> wqq111 = new LambdaQueryWrapper<>();
wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
- final List<TjAskHistorys> list11 = historysService.list(wqq111);
+ wqq111.eq(TjAskHistorys::getDataType,1);
+ List<TjAskHistorys> list11 = historysService.list(wqq111);
one.setTjAskHistorysList(list11);
+ wqq111 = new LambdaQueryWrapper<>();
+ wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
+ wqq111.eq(TjAskHistorys::getDataType,2);
+ list11 = historysService.list(wqq111);
+ one.setZhiyezzList(list11);
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ one.setTjLx(order.getTjCategory());
+
+
return AjaxResult.success(one);
}else {
TjAskMedicalHistory a = new TjAskMedicalHistory();
--
Gitblit v1.8.0