From 0c621621889c90a119e2ff9e41c4f5528f395f7e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 五月 2025 16:04:18 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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 8fd0c47..f943254 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;
+    }
+
     /**
      * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
      *
@@ -315,6 +328,9 @@
                     continue;
                 }
                 try {
+                    if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
+                        continue;
+                    }
                     // 鏍规嵁鎮h�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
                     ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
                     serviceTaskdiag.setLongtask(1L);
@@ -342,7 +358,6 @@
                 }
             }
         }
-
 
         //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭d箣鍓嶇殑鍑洪櫌鎮h�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
         PatMedInhosp patMedInhosp = new PatMedInhosp();
@@ -467,7 +482,7 @@
     @Override
     public List<PatMedRes> getDeptRanking(PatMedReq patMedReq) {
 
-        return patMedInhospMapper.getDeptRanking(patMedReq);
+        return serviceSubtaskMapper.getDeptRanking(patMedReq);
     }
 
     @Override
@@ -642,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());
@@ -670,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");

--
Gitblit v1.9.3