From 07e3dfe61e3bbe7bc02e45e96247d4d922dca380 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 29 九月 2025 13:56:19 +0800
Subject: [PATCH] 新增随访数据查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 11 +++++++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 22 +++++++++++++++++++---
smartor/src/main/java/com/smartor/mapper/UtilsMapper.java | 12 ++++++++----
3 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 3bf67f6..751dd01 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -165,6 +165,17 @@
util.exportExcel(response, list, "鍗曚竴浠诲姟锛堥殢璁匡級鏁版嵁");
}
+ /**
+ * 闅忚鏁版嵁鏌ヨ
+ */
+ @Log(title = "闅忚鏁版嵁鏌ヨ", businessType = BusinessType.EXPORT)
+ @PostMapping("/querySubtaskList")
+ public AjaxResult querySubtaskList(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO);
+ return success(serviceSubtaskService.selectServiceSubtaskList(serviceSubtaskVO));
+ }
+
/**
* 鍐嶆闅忚鏁版嵁鏌ヨ
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index 1e73539..7612fae 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -169,6 +169,8 @@
List<PatMedInhosp> patMedInhospList = chMapper.selectPatMedInhospList(patMedInhosp);
log.info("鍙悓姝ュ嚭鍏ラ櫌鏁伴噺" + patMedInhospList.size());
for (PatMedInhosp pm : patMedInhospList) {
+ List<PatArchive> patArchives1=new ArrayList<>();
+
try {
//鎮ｈ�呭熀鏈俊鎭�
if(ObjectUtils.isNotEmpty(pm.getPatno())) {
@@ -179,7 +181,7 @@
if (patArchives.size() > 0) {
PatArchive pa1 = new PatArchive();
pa1.setPatientno(pm.getPatno());
- List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
+ patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
if (CollectionUtils.isNotEmpty(patArchives1)) {
patArchives.get(0).setId(patArchives1.get(0).getId());
patArchives.get(0).setUpdateTime(new Date());
@@ -187,6 +189,7 @@
} else {
patArchives.get(0).setCreateTime(new Date());
count += patArchiveMapper.insertPatArchiveSingle(patArchives.get(0));
+ patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
}
}
}
@@ -195,6 +198,9 @@
}
try {
+ if(patArchives1.size()>0) {
+ pm.setPatid(patArchives1.get(0).getId());
+ }
//鍚屾鍑哄叆闄�
PatMedInhosp pmi = new PatMedInhosp();
pmi.setSerialnum(pm.getSerialnum());
@@ -452,10 +458,20 @@
@Override
public Integer selectDeptList(SysDept dept) {
+ int count=0;
List<SysDept> sysDepts = chMapper.selectDeptList(dept);
log.info("selectDeptList鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", sysDepts.size());
- int i = sysDept2Mapper.batchDept(sysDepts);
- return i;
+ // count = sysDept2Mapper.batchDept(sysDepts);
+ for(SysDept row : sysDepts){
+ SysDept sysDeptTemp= sysDept2Mapper.selectDeptByCode(row.getDeptCode());
+ if(sysDeptTemp!=null&&sysDeptTemp.getDeptName()!=null){
+ row.setDeptId(sysDeptTemp.getDeptId());
+ count+=sysDept2Mapper.updateDept(row);
+ }else{
+ count+=sysDept2Mapper.insertDept(row);
+ }
+ }
+ return count;
}
}
diff --git a/smartor/src/main/java/com/smartor/mapper/UtilsMapper.java b/smartor/src/main/java/com/smartor/mapper/UtilsMapper.java
index 4938abd..bd6e601 100644
--- a/smartor/src/main/java/com/smartor/mapper/UtilsMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/UtilsMapper.java
@@ -1,9 +1,6 @@
package com.smartor.mapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
import java.util.List;
import java.util.Map;
@@ -23,6 +20,13 @@
* 鏇存柊sql
* @param sql
*/
+ @Insert({"${sql}"})
+ Integer insertSql(@Param("sql") String sql);
+
+ /**
+ * 鏇存柊sql
+ * @param sql
+ */
@Update({"${sql}"})
Integer updateSql(@Param("sql") String sql);
--
Gitblit v1.9.3