From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
index 8d19c8b..493cb8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/MedicalHistoryController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;
import cn.hutool.db.Page;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,10 +37,11 @@
* 鏌ヨ鐥呭彶鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('system:history:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/selectMedicalHistoryList")
@ApiOperation("鏌ヨ鐥呭彶鍒楄〃")
- public TableDataInfo selectMedicalHistorylist(@RequestBody MedicalHistory medicalHistory) {
- PageUtils.startPageByPost(medicalHistory.getPageNum(),medicalHistory.getPageSize());
+ public TableDataInfo selectMedicalHistorylist(@RequestBody MedicalHistory medicalHistory) {
+ PageUtils.startPageByPost(medicalHistory.getPageNum(), medicalHistory.getPageSize());
List<MedicalHistory> list = medicalHistoryService.selectMedicalHistoryList(medicalHistory);
return getDataTable(list);
}
@@ -63,7 +65,7 @@
//@PreAuthorize("@ss.hasPermi('system:history:query')")
@ApiOperation("鑾峰彇鐥呭彶璇︾粏淇℃伅")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id,@PathVariable("pid") Long pid) {
+ public AjaxResult getInfo(@PathVariable("id") Long id, @PathVariable("pid") Long pid) {
return success(medicalHistoryService.selectMedicalHistoryById(id));
}
@@ -73,6 +75,7 @@
//@PreAuthorize("@ss.hasPermi('system:history:add')")
@Log(title = "鐥呭彶", businessType = BusinessType.INSERT)
@ApiOperation("鏂板鐥呭彶")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@RequestBody MedicalHistory medicalHistory) {
medicalHistory.setOrgid(getOrgid());
@@ -85,6 +88,7 @@
//@PreAuthorize("@ss.hasPermi('system:history:edit')")
@Log(title = "鐥呭彶", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼鐥呭彶")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody MedicalHistory medicalHistory) {
return toAjax(medicalHistoryService.updateMedicalHistory(medicalHistory));
--
Gitblit v1.9.3