From fc1f48f6cb2736bf03b7750563e5d9830d6fd4ba Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 06 十一月 2026 13:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/smartor_ls_261103' into smartor_ls_261103
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index 4c0445d..558544c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -7,6 +7,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.inhospvisit.domain.PatMedInhosp;
import com.ruoyi.common.core.service.dto.PatMedReq;
+import com.smartor.domain.DTO.ManualVisitDTO;
import com.smartor.service.IPatMedInhospService;
import com.smartor.service.IPatMedOuthospService;
import io.swagger.annotations.Api;
@@ -14,6 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
/**
* 鎮ｈ�呬綇闄㈣褰旵ontroller
@@ -79,4 +82,26 @@
public TableDataInfo getDocAndPat(@RequestBody PatMedInhosp patMedInhosp) {
return getDataTable(patMedInhospService.getDocAndPat(patMedInhosp));
}
+ /**
+ * 鎮ｈ�呬汉宸ラ殢璁匡細鍒犻櫎鏈畬鎴愰殢璁夸换鍔″苟鎸夋寚瀹氫换鍔￠噸鏂扮敓鎴�
+ */
+ @ApiOperation("addManualVisit")
+ @PostMapping("/addManualVisit")
+ public AjaxResult addManualVisit(@RequestBody ManualVisitDTO manualVisitDTO) {
+ Map<String, Object> result = patMedInhospService.addManualVisit(manualVisitDTO);
+ if (Boolean.TRUE.equals(result.get("hasDuplicate"))) {
+ return AjaxResult.warn((String) result.get("tipMessage"), result);
+ }
+ return success(result);
+ }
+
+ /**
+ * 涓存椂鏂规硶锛屽鐞哾iagcheckFlag = 0鐨勬暟鎹紝閲嶆柊鐢熸垚闅忚浠诲姟
+ */
+ @ApiOperation("dealIcd10Subtask")
+ @PostMapping("/dealIcd10Subtask")
+ public void addIcd10SubTask(@RequestBody PatMedInhosp patMedInhospVo) {
+ String config = configService.selectConfigByKey("visit.early.day");
+ iPatMedInhospService.dealIcd10Subtask(patMedInhospVo, config);
+ }
}
--
Gitblit v1.9.3