From d2aa4820da0822ae17c7aada2b5364d3b172a65e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 12 八月 2026 14:29:53 +0800
Subject: [PATCH] 【丽水】去掉出院记录扫描专病为出院随访限制
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 4e6ad83..16672c7 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -432,19 +432,19 @@
Integer type = 1;
if (StringUtils.isNotEmpty(deptCodes)) {
type = 1;
- deptCodeList = Arrays.asList(deptCodes.split(","));
+ deptCodeList = new ArrayList<>(Arrays.asList(deptCodes.split(",")));
}
if(StringUtils.isNotEmpty(wardCodes)) {
type = 2;
- wardCodeList = Arrays.asList(wardCodes.split(","));
+ wardCodeList = new ArrayList<>(Arrays.asList(wardCodes.split(",")));
}
if(StringUtils.isNotEmpty(icd10Codes)) {
type = 3;
- icd10CodeList = Arrays.asList(icd10Codes.split(","));
+ icd10CodeList = new ArrayList<>(Arrays.asList(icd10Codes.split(",")));
}
if (StringUtils.isNotEmpty(opLevelCodes)) {
type = 6;
- opLevelCodeList = Arrays.asList(opLevelCodes.split(","));
+ opLevelCodeList = new ArrayList<>(Arrays.asList(opLevelCodes.split(",")));
}
//闈炴墜鏈鐞嗘柟寮�
if(type != 6){
@@ -886,12 +886,12 @@
if (ObjectUtils.isEmpty(serviceSubtask)) {
return;
}
- if (StringUtils.isNotEmpty(patMedOperationItem.getDeptcode())) {
- serviceSubtask.setVisitDeptCode(patMedOperationItem.getDeptcode());
- serviceSubtask.setVisitDeptName(patMedOperationItem.getDeptname());
+ if (StringUtils.isNotEmpty(patMedOperationItem.getLeaveldeptcode())) {
+ serviceSubtask.setVisitDeptCode(patMedOperationItem.getLeaveldeptcode());
+ serviceSubtask.setVisitDeptName(patMedOperationItem.getLeaveldeptname());
} else {
- serviceSubtask.setVisitDeptCode(patMedOperationItem.getHospitaldistrictcode());
- serviceSubtask.setVisitDeptName(patMedOperationItem.getHospitaldistrictname());
+ serviceSubtask.setVisitDeptCode(patMedOperationItem.getLeavehospitaldistrictcode());
+ serviceSubtask.setVisitDeptName(patMedOperationItem.getLeavehospitaldistrictname());
}
//璁板綍insertServiceSubtask璇彞杩斿洖鐘舵��
Integer i = 0;
@@ -1280,8 +1280,11 @@
serviceTaskoper.setOplevelcode(opItem.getOplevelcode());
//鏍规嵁绉戝銆佺梾鍖鸿繃婊�
- serviceTaskoper.setDeptCode(opItem.getDeptcode());
- serviceTaskoper.setWardCode(opItem.getHospitaldistrictcode());
+ if(StringUtils.isNotEmpty(opItem.getLeaveldeptcode())){
+ serviceTaskoper.setDeptCode(opItem.getLeaveldeptcode());
+ }else {
+ serviceTaskoper.setWardCode(opItem.getLeavehospitaldistrictcode());
+ }
List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
//濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
@@ -1336,7 +1339,7 @@
// 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
serviceTaskdiag.setLongtask(1L);
- serviceTaskdiag.setServiceType("2");
+// serviceTaskdiag.setServiceType("2");
if (active.equals("nhfy")) {
//鍗楀崕闄勪竴鐨刬cd10code鏈夐噸澶嶏紝鎵�浠ョ敤涓昏瘖鏂悕绉板幓鏌ヨ
serviceTaskdiag.setIcd10name(pmiJB.getLeavediagname());
@@ -1825,7 +1828,7 @@
ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
serviceTaskdiag.setLongtask(1L);
- serviceTaskdiag.setServiceType("2");
+// serviceTaskdiag.setServiceType("2");
if (active.equals("nhfy")) {
serviceTaskdiag.setIcd10name(patMedInhosp1.getLeavediagname());
if (StringUtils.isEmpty(patMedInhosp1.getLeavediagname())) {
--
Gitblit v1.9.3