From 2ad7a1b9035321fc16b253ad2cdd73c6d5e15d64 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 五月 2026 16:18:52 +0800
Subject: [PATCH] 新增sendstateView(1:待随访(2 待发送);2:随访中(1 被领取、3 已发送)、3:未完成(5 发送失败、7、超时)、4:已完成( 6 已完成)、5:无需随访(4 不执行))

---
 smartor/src/main/java/com/smartor/service/impl/XHGatherPatArchiveServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/XHGatherPatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/XHGatherPatArchiveServiceImpl.java
index b55a0a5..cb0961a 100644
--- a/smartor/src/main/java/com/smartor/service/impl/XHGatherPatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/XHGatherPatArchiveServiceImpl.java
@@ -284,6 +284,7 @@
         PatMedInhosp queryInhosp = new PatMedInhosp();
         queryInhosp.setPatno(patArchive.getPatientno());
         queryInhosp.setSerialnum(patMedInhosp.getSerialnum());
+        queryInhosp.setCry(Integer.valueOf(cry));
         List<PatMedInhosp> existingInhosps = patMedInhospService.selectPatMedInhospList(queryInhosp);
 
         // 淇濆瓨鎴栨洿鏂颁綇闄俊鎭�
@@ -316,11 +317,14 @@
         // 浣忛櫌淇℃伅
         patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId());
         patMedInhosp.setFuflag("1");
+        if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1"))
+            patMedInhosp.setFuflag("0");
         patMedInhosp.setInhospstate("0".equals(cry) ? "0" : "1");
 
         // 鍖婚櫌鍜屽簥浣嶄俊鎭�
         patMedInhosp.setHospitalcode(thiedInhospInfo.getAreaId());
         patMedInhosp.setBedNo(thiedInhospInfo.getAdmissBedNo());
+        patMedInhosp.setCry(Integer.valueOf(cry));
 
 
         // 鏃堕棿淇℃伅
@@ -390,7 +394,7 @@
         patArchive.setPatientno(thiedInhospInfo.getPatiMediaNo());
         patArchive.setIdcardno(thiedInhospInfo.getPatiIdCardNo().trim());
         patArchive.setName(thiedInhospInfo.getPatiRecordName());
-        patArchive.setSourcefrom(2);
+        patArchive.setSourcefrom(2L);
         patArchive.setPattype("2");
 
         // 鎬у埆

--
Gitblit v1.9.3