From e4e220916dd2a4aa649a9b0162e5b5ed0dc9d7e5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 五月 2025 10:36:54 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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 1f2294e..c44c160 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -76,6 +76,19 @@
         return patMedInhospList;
     }
 
+    @Override
+    public Map<String, Integer> queryPersonCount(PatServiceCount patServiceCount) {
+        if (patServiceCount.getInterval() == 1) {
+            //鍛�
+        } else if (patServiceCount.getInterval() == 2) {
+            //鏈�
+        } else if (patServiceCount.getInterval() == 3) {
+            //骞�
+        }
+
+        return null;
+    }
+
     /**
      * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
      *
@@ -469,7 +482,7 @@
     @Override
     public List<PatMedRes> getDeptRanking(PatMedReq patMedReq) {
 
-        return patMedInhospMapper.getDeptRanking(patMedReq);
+        return serviceSubtaskMapper.getDeptRanking(patMedReq);
     }
 
     @Override
@@ -644,6 +657,8 @@
         serviceSubtask.setDrname(patMedInhosp1.getDrname());
         serviceSubtask.setDeptcode(patMedInhosp1.getLeaveldeptcode());
         serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
+        serviceSubtask.setLeaveicd10code(patMedInhosp1.getLeaveicd10code());
+        serviceSubtask.setLeavediagname(patMedInhosp1.getDiagname());
         serviceSubtask.setTemplateid(serviceTask.getTemplateid());
         serviceSubtask.setTemplatename(serviceTask.getTemplatename());
         serviceSubtask.setPatid(patArchive.getId());
@@ -672,6 +687,7 @@
         serviceSubtask.setLongSendTime(newDate);
         //鎮h�呭彂閫佹椂闂�
         if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
+//            log.error("serviceSubtask99999999鐨勫�间负锛歿}",serviceSubtask);
             String remark = patArchive.getNotrequiredreason();
             serviceSubtask.setRemark(remark);
             serviceSubtask.setResult("error");
@@ -691,7 +707,7 @@
                 subtask.setPatid(patMedInhosp1.getPatid());
                 subtask.setSendstate(2L);
                 List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
-                log.error("鍏ラ櫌鐨勬偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
+//                log.error("鍏ラ櫌鐨勬偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
                 if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
                     for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
                         if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
@@ -700,7 +716,7 @@
                         }
                         if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
                             //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
-                            log.error("鎮h�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
+//                            log.error("鎮h�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
                             serviceSubtask1.setSendstate(4L);
                             serviceSubtask1.setRemark("鎮h�呭啀鍏ラ櫌");
                             serviceSubtask1.setResult("error");

--
Gitblit v1.9.3