From 55d724ddd52b2acb6e7ee2d291e04e4b6d96ad19 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 16:06:47 +0800
Subject: [PATCH] sync: service_subtask 科室病区字段重命名对齐
---
smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
index 3f00820..e6b2227 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -482,14 +482,16 @@
public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedOuthosp patMedOuthosp, PatArchive patArchive) {
ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
serviceSubtask.setTaskid(serviceTask.getTaskid());
+ serviceSubtask.setOrgid(serviceTask.getOrgid());
+ serviceSubtask.setCampusid(serviceTask.getCampusid());
if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
serviceSubtask.setDrcode(patMedOuthosp.getDrcode());
serviceSubtask.setDrname(patMedOuthosp.getDrname());
- serviceSubtask.setDeptcode(patMedOuthosp.getDeptcode());
+ serviceSubtask.setLeaveldeptcode(patMedOuthosp.getDeptcode());
serviceSubtask.setInhospid(patMedOuthosp.getId());
serviceSubtask.setHospno(patMedOuthosp.getOuthospno());
- serviceSubtask.setDeptname(patMedOuthosp.getDeptname());
+ serviceSubtask.setLeaveldeptname(patMedOuthosp.getDeptname());
serviceSubtask.setTemplateid(serviceTask.getTemplateid());
serviceSubtask.setTemplatename(serviceTask.getTemplatename());
serviceSubtask.setPatid(patArchive.getId());
@@ -546,7 +548,8 @@
Integer num = 0;
//鏅畞 瀛樺湪鐩稿悓璇婃柇鐨勯棬璇婅褰曞垯鏂板鍐嶆闅忚,鍚﹀垯鏂板闅忚
- if(patMedOuthosp.getOrgid().equals("47255004333112711A1001")){
+ if(ObjectUtils.isNotEmpty(patMedOuthosp.getOrgid()) &&
+ patMedOuthosp.getOrgid().equals("47255004333112711A1001")){
PatMedOuthosp patMedOuthospVo = new PatMedOuthosp();
List<PatMedOuthosp> patMedOuthosps = new ArrayList<>();
patMedOuthospVo.setOrgid(patMedOuthosp.getOrgid());
@@ -653,10 +656,11 @@
serviceSubtaskEntity0.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 7L)));
serviceSubtaskEntity0.setPatid(patid);
//鏅畞鏍规嵁璇婃柇鍐嶆闅忚
- if(patMedOuthosp.getOrgid().equals("47255004333112711A1001") && !CollectionUtils.isEmpty(inhospids)){
+ if(ObjectUtils.isNotEmpty(patMedOuthosp.getOrgid()) &&
+ patMedOuthosp.getOrgid().equals("47255004333112711A1001") && !CollectionUtils.isEmpty(inhospids)){
serviceSubtaskEntity0.setInhospids(inhospids);
}else {
- serviceSubtaskEntity0.setDeptcode(deptcode);
+ serviceSubtaskEntity0.setLeaveldeptcode(deptcode);
}
serviceSubtaskEntity0.setSort(0);
@@ -679,7 +683,7 @@
serviceSubtask1.setVisitDeptCode(serviceSubtask0.getVisitDeptCode());
serviceSubtask1.setVisitDeptName(serviceSubtask0.getVisitDeptName());
//鏂颁换鍔＄瀹ゆ槸褰撳墠鍑洪櫌绉戝
- serviceSubtask1.setDeptcode(patMedOuthosp.getDeptcode());
+ serviceSubtask1.setLeaveldeptcode(patMedOuthosp.getDeptcode());
serviceSubtask1.setCreateTime(new Date());
serviceSubtask1.setUpdateTime(new Date());
serviceSubtask1.setFinishtime(null);
@@ -695,7 +699,7 @@
// serviceSubtaskEntity0.setOrgid(patMedOuthosp.getOrgid());
// serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
// serviceSubtaskEntity.setPatid(patid);
-// serviceSubtaskEntity.setDeptcode(deptcode);
+// serviceSubtaskEntity.setLeaveldeptcode(deptcode);
// serviceSubtaskEntity.setSort(0);
// List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
// if(!CollectionUtils.isEmpty(serviceSubtaskList)){
--
Gitblit v1.9.3