From 07e3dfe61e3bbe7bc02e45e96247d4d922dca380 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 29 九月 2025 13:56:19 +0800
Subject: [PATCH] 新增随访数据查询

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java |   52 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 17 deletions(-)

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 0fc6d71..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,23 +169,28 @@
         List<PatMedInhosp> patMedInhospList = chMapper.selectPatMedInhospList(patMedInhosp);
         log.info("鍙悓姝ュ嚭鍏ラ櫌鏁伴噺" + patMedInhospList.size());
         for (PatMedInhosp pm : patMedInhospList) {
+            List<PatArchive> patArchives1=new ArrayList<>();
+
             try {
                 //鎮h�呭熀鏈俊鎭�
-                PatArchive patArchive = new PatArchive();
-                patArchive.setPatientno(pm.getPatno());
-                List<PatArchive> patArchives = chMapper.selectPatArchiveList(patArchive);
-                if (patArchives.size() > 0) {
-                    PatArchive pa1 = new PatArchive();
-                    pa1.setPatientno(pm.getPatno());
-                    List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
-                    if (CollectionUtils.isNotEmpty(patArchives1)) {
-                        patArchives.get(0).setId(patArchives1.get(0).getId());
-                        patArchives.get(0).setUpdateTime(new Date());
-                        count += patArchiveMapper.updatePatArchive(patArchives.get(0));
-                    } else {
-                        patArchives.get(0).setCreateTime(new Date());
-                        count += patArchiveMapper.insertPatArchiveSingle(patArchives.get(0));
-
+                if(ObjectUtils.isNotEmpty(pm.getPatno())) {
+                    PatArchive patArchive = new PatArchive();
+                    patArchive.setPatientno(pm.getPatno());
+                    patArchive.setPageSize(5);
+                    List<PatArchive> patArchives = chMapper.selectPatArchiveList(patArchive);
+                    if (patArchives.size() > 0) {
+                        PatArchive pa1 = new PatArchive();
+                        pa1.setPatientno(pm.getPatno());
+                        patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
+                        if (CollectionUtils.isNotEmpty(patArchives1)) {
+                            patArchives.get(0).setId(patArchives1.get(0).getId());
+                            patArchives.get(0).setUpdateTime(new Date());
+                            count += patArchiveMapper.updatePatArchive(patArchives.get(0));
+                        } else {
+                            patArchives.get(0).setCreateTime(new Date());
+                            count += patArchiveMapper.insertPatArchiveSingle(patArchives.get(0));
+                            patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
+                        }
                     }
                 }
             }catch (Exception ex) {
@@ -193,6 +198,9 @@
             }
 
             try {
+                if(patArchives1.size()>0) {
+                    pm.setPatid(patArchives1.get(0).getId());
+                }
                 //鍚屾鍑哄叆闄�
                 PatMedInhosp pmi = new PatMedInhosp();
                 pmi.setSerialnum(pm.getSerialnum());
@@ -450,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;
     }
 
 }

--
Gitblit v1.9.3