From 7bb9f622eff9e3bb97751f3008b5513b2531f324 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 25 十二月 2023 16:17:07 +0800
Subject: [PATCH] zjh 本地 2023/12/25 -3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 2 --
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 4 +---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java | 6 ++++++
4 files changed, 12 insertions(+), 5 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 0352949..9d8e7ad 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
@@ -270,9 +270,7 @@
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = orderService.getOne(wq1);
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
if (null != tjOrder) {
tjOrder.setConfirmTime(new DateTime());
tjOrder.setConfirmDoctor(sysUser.getNickName());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java
index 9d1d398..6556209 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java
@@ -89,6 +89,9 @@
@PostMapping
@ApiOperation(value = "鏂板鍗曚綅閮ㄩ棬淇℃伅")
public AjaxResult add(@RequestBody TjDwDept tjDwDept) {
+ if(null==tjDwDept.getDwDeptName()){
+ return AjaxResult.error("閮ㄩ棬鍚嶇О涓嶈兘涓虹┖!");
+ }
return toAjax(dwDeptService.save(tjDwDept));
}
@@ -100,6 +103,9 @@
@PutMapping
@ApiOperation(value = "淇敼鍗曚綅閮ㄩ棬淇℃伅")
public AjaxResult edit(@RequestBody TjDwDept tjDwDept) {
+ if(null==tjDwDept.getDwDeptName()){
+ return AjaxResult.error("閮ㄩ棬鍚嶇О涓嶈兘涓虹┖!");
+ }
return toAjax(dwDeptService.updateById(tjDwDept));
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index 0f58ccc..09de2f6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -97,6 +97,11 @@
@PostMapping
@ApiOperation(value = "鏂板鍗曚綅鍒嗙粍淇℃伅")
public AjaxResult add(@RequestBody TjDwGrouping tjDwGrouping) {
+ if((null==tjDwGrouping.getGroupingName() || "".equals(tjDwGrouping.getGroupingName()))
+ || (null==tjDwGrouping.getSex() || "".equals(tjDwGrouping.getSex()))
+ || (null==tjDwGrouping.getPacName()||"".equals(tjDwGrouping.getPacName()))){
+ return AjaxResult.error("蹇呭～椤逛笉鑳戒负绌�!");
+ }
tjDwGrouping.setDwDeptName(compService.getById(tjDwGrouping.getDwId()).getCnName());
if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) {
if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index d19c10f..427c8de 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -43,7 +43,6 @@
/**
* 濮撳悕
*/
- @Excel(name = "濮撳悕")
@ExcelExport(value = "濮撳悕",sort =0)
@ExcelImport(value = "濮撳悕", required = true)
@ApiModelProperty("濮撳悕")
@@ -280,7 +279,6 @@
/**
* 鍗曚綅閮ㄩ棬鍒嗙粍id
*/
- @Excel(name = "鍗曚綅閮ㄩ棬鍒嗙粍id")
private String groupingId;
@ApiModelProperty(value = "鍒嗙粍鍚�")
--
Gitblit v1.8.0