From 8e6c328121391f0eb6c85f911a11603cbb906829 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 30 七月 2026 15:46:43 +0800
Subject: [PATCH] 【市一】AI

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

diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 49f947d..46a1457 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -11,6 +11,7 @@
 import com.ruoyi.common.utils.StringUtils;
 import com.smartor.common.ScheduleSubtaskBuilder;
 import com.smartor.domain.*;
+import com.smartor.domain.DTO.PatMedInhospDTO;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
 import com.smartor.mapper.*;
 import com.smartor.service.IPatMedInhospService;
@@ -98,14 +99,18 @@
      */
     @Override
     public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) {
-        if (patMedInhosp.getCry() == 0) {
+        if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 0) {
             patMedInhosp.setDeptcodeList(patMedInhosp.getLeaveldeptcodes());
             patMedInhosp.setHospitaldistrictcodeList(patMedInhosp.getLeavehospitaldistrictcodes());
             patMedInhosp.setLeaveldeptcodes(null);
             patMedInhosp.setLeavehospitaldistrictcodes(null);
             patMedInhosp.setInhospstate("0");
-        } else if (patMedInhosp.getCry() == 1) {
+        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 1) {
             patMedInhosp.setInhospstate("1");
+        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 2) {
+            patMedInhosp.setInhospstate("2");
+        } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 3) {
+            patMedInhosp.setInhospstate("3");
         }
 
         List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
@@ -114,6 +119,24 @@
             patMedInhosp1.setTagname(tagname);
         }
         return patMedInhospList;
+    }
+
+    @Override
+    public List<PatMedInhospDTO> selectPatMedInhospByApplication(PatMedInhosp patMedInhosp) {
+        List<PatMedInhosp> patMedInhosps = selectPatMedInhospList(patMedInhosp);
+        if (!org.springframework.util.CollectionUtils.isEmpty(patMedInhosps)) {
+            return null;
+        }
+        List<PatMedInhospDTO> patMedInhospDTOList = DtoConversionUtils.sourceToTarget(patMedInhosps, PatMedInhospDTO.class);
+        for (PatMedInhospDTO pmd : patMedInhospDTOList) {
+            ServiceSubtaskEntity serviceSubtask = new ServiceSubtaskEntity();
+            serviceSubtask.setServiceType("4");
+            serviceSubtask.setInhospid(pmd.getInhospid());
+            List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtask);
+            if (CollectionUtils.isNotEmpty(serviceSubtasks)) pmd.setFinishFlag("1");
+        }
+
+        return patMedInhospDTOList;
     }
 
     @Override
@@ -828,10 +851,10 @@
         if (ObjectUtils.isEmpty(serviceSubtask)) {
             return;
         }
-        if(StringUtils.isNotEmpty(patMedOperationItem.getDeptcode())){
+        if (StringUtils.isNotEmpty(patMedOperationItem.getDeptcode())) {
             serviceSubtask.setVisitDeptCode(patMedOperationItem.getDeptcode());
             serviceSubtask.setVisitDeptName(patMedOperationItem.getDeptname());
-        }else {
+        } else {
             serviceSubtask.setVisitDeptCode(patMedOperationItem.getHospitaldistrictcode());
             serviceSubtask.setVisitDeptName(patMedOperationItem.getHospitaldistrictname());
         }
@@ -952,7 +975,8 @@
 
 
     //灏佽serviceSubtask
-    private ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, Integer type) {
+    @Override
+    public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config, Integer type) {
         //澧炲姞serviceTask鍒ょ┖
 //        if(Objects.isNull(serviceTask)){
 //            return null;
@@ -990,6 +1014,7 @@
         serviceSubtask.setSex(patArchive.getSex());
         serviceSubtask.setAge(patArchive.getAge());
         serviceSubtask.setSendstate(2L);
+        serviceSubtask.setCampusid(patMedInhosp1.getCampusid());
         serviceSubtask.setManagementDoctor(patMedInhosp1.getManagementDoctor());
         serviceSubtask.setManagementDoctorCode(patMedInhosp1.getManagementDoctorCode());
         serviceSubtask.setStarttime(patMedInhosp1.getStarttime());

--
Gitblit v1.9.3