From 28da7e877a08aaff967efa4adf9d2d4ab4b80c67 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 09 四月 2026 16:29:46 +0800
Subject: [PATCH] 省立同德满意度功能修改

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
index 2ae5675..119a6da 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSLTDHealthcareRecordServiceImpl.java
@@ -15,6 +15,7 @@
 import com.smartor.mapper.*;
 import com.smartor.service.IPatArchiveService;
 import com.smartor.service.IPatMedInhospService;
+import com.smartor.service.IPatMedOuthospService;
 import com.smartor.service.IServiceSLTDHealthcareRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -48,7 +49,7 @@
     private IPatMedInhospService patMedInhospService;
 
     @Autowired
-    private PatMedOuthospMapper patMedOuthospMapper;
+    private IPatMedOuthospService patMedOuthospService;
 
     @Autowired
     private SysUser2Mapper sysUser2Mapper;
@@ -392,6 +393,13 @@
         params.put("inpatientArea", null);
 //        params.put("status", reqVO.getStatusList() != null && !reqVO.getStatusList().isEmpty() ? reqVO.getStatusList().get(0) : null);
         params.put("status", null);
+        // 鍒嗛〉鍙傛暟锛堥棬鎬ヨ瘖鍒嗛〉閲囬泦鏃朵娇鐢級
+        if (reqVO.getCurrent() != null) {
+            params.put("current", reqVO.getCurrent());
+        }
+        if (reqVO.getSize() != null) {
+            params.put("size", reqVO.getSize());
+        }
         return params;
     }
 
@@ -502,19 +510,15 @@
             try {
                 //杩欓噷鐢ㄨ嚜鍔ㄥ拷鐣ラ噸澶嶄細鏈夐棶棰橈紝濡傛灉琛ㄩ噸鏂板缓锛宻erialnum绱㈠紩浼氫涪澶便�傚氨鏃犳硶鍘婚噸锛屾墍浠ヨ繕鏄渶瑕佸唴瀛橀噷鍘婚噸
                 batchList = DistinctByProperty.distinctByProperty(batchList, PatMedOuthosp::getSerialnum);
-                int insertCount = patMedOuthospMapper.batchInsertIgnore(batchList);
+                Integer insertCount = 0;
+                for (PatMedOuthosp patMedOuthosp : batchList) {
+                    insertCount += patMedOuthospService.insertPatMedOuthosp(patMedOuthosp);
+                }
+
                 log.info("鎵归噺鎻掑叆闂ㄦ�ヨ瘖璁板綍锛屾�绘暟锛歿}, 瀹為檯鎻掑叆锛歿}", batchList.size(), insertCount);
 
             } catch (Exception e) {
                 log.error("鎵归噺鎻掑叆闂ㄦ�ヨ瘖璁板綍澶辫触", e);
-                // 闄嶇骇涓洪�愭潯鎻掑叆
-                for (PatMedOuthosp patMedOuthosp : batchList) {
-                    try {
-                        patMedOuthospMapper.insertPatMedOuthosp(patMedOuthosp);
-                    } catch (Exception ex) {
-                        log.warn("鍗曟潯鎻掑叆澶辫触锛歴erialnum={}", patMedOuthosp.getSerialnum());
-                    }
-                }
             }
         }
         return true;
@@ -762,7 +766,7 @@
         patArchive.setPatientno("" + dto.getPatientId());
         patArchive.setIdcardno(StringUtils.isEmpty(dto.getIdCardNo()) ? "" + dto.getMedicalCardId() : dto.getIdCardNo().trim());
         patArchive.setName(dto.getPatientName());
-        patArchive.setSourcefrom(2);
+        patArchive.setSourcefrom(2L);
         patArchive.setPattype("2");
         patArchive.setSex("鐢�".equals(dto.getGender()) ? 1L : 2L);
         patArchive.setNation(dto.getNation());

--
Gitblit v1.9.3