From bd0634ddee19487b1f82e782ff1fa9f18cb88a3d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 09 六月 2026 18:02:20 +0800
Subject: [PATCH] 【市一】手术随访对接
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 4 ++--
smartor/src/main/java/com/smartor/service/IPatMedInhospService.java | 8 ++++++++
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 12 +++++++++---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 2 +-
smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 10 ++++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 2 +-
smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java | 2 +-
smartor/src/main/java/com/smartor/domain/BaseDictOperation.java | 2 +-
9 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index b97a3ad..49f7537 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -246,4 +246,14 @@
}
}
}
+
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃
+ */
+ @ApiOperation("addOperationSubTask")
+ @PostMapping("/addOperationSubTask")
+ public void addOperationSubTask() {
+ String config = configService.selectConfigByKey("visit.early.day");
+ iPatMedInhospService.addOperationSubTask(config);
+ }
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index d1e648a..bc6375d 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -381,7 +381,7 @@
PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
patMedOperationItem.setOrgid(operation.getOrgid());
if(StringUtils.isNotEmpty(operation.getOpid())){
- patMedOperationItem.setOpid(Long.valueOf(operation.getOpid()));
+ patMedOperationItem.setOpid(operation.getOpid());
patMedOperationItem.setLastStartTime(operation.getLastStartTime());
patMedOperationItem.setLastEndTime(operation.getLastEndTime());
List<PatMedOperationItem> patMedOperationItems = chMapper.selectOperItemList(patMedOperationItem);
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 94aeecc..01a61db 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -934,10 +934,10 @@
AND oi.opid = #{opid}
</if>
<if test="lastStartTime != null and lastStartTime != ''">
- and last_Update_Time >= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
+ and oi.last_Update_Time >= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
<if test="lastEndTime != null and lastEndTime != ''">
- and last_Update_Time <= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
+ and oi.last_Update_Time <= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
</select>
</mapper>
diff --git a/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java b/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
index 87f0132..bfc3ad1 100644
--- a/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
+++ b/smartor/src/main/java/com/smartor/domain/BaseDictOperation.java
@@ -32,7 +32,7 @@
*/
@ApiModelProperty("his鎵嬫湳id")
@Excel(name = "his鎵嬫湳id")
- private Long opid;
+ private String opid;
/**
* 鎵嬫湳鍚嶇ОID
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
index d58c53f..8fd63cb 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -39,7 +39,7 @@
*/
@ApiModelProperty("鎵嬫湳id")
@Excel(name = "鎵嬫湳id")
- private Long opid;
+ private String opid;
/**
* 鎵嬫湳鍚嶇ОID
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
index fd644b1..3722acd 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
@@ -57,7 +57,7 @@
*/
@ApiModelProperty("鎵嬫湳id")
@Excel(name = "鎵嬫湳id")
- private Long opid;
+ private String opid;
/**
* 鎵嬫湳缂栫爜
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
index 680bee7..774c5bc 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedInhospService.java
@@ -115,4 +115,12 @@
* @return
*/
public List<PatMedInhosp> getDocAndPat(PatMedInhosp patMedInhosp);
+
+ /**
+ * 澶勭悊浠巋is鍙栨潵鐨勬墜鏈俊鎭�
+ *
+ * @param
+ * @return 缁撴灉
+ */
+ public void addOperationSubTask(String config);
}
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 778fee9..a7ed6a4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -788,9 +788,14 @@
if (Objects.isNull(patMedOperationItem.getOplevelcode())) {
return;
}
- PatMedOperation patMedOperation = patMedOperationMapper.selectPatMedOperationById(patMedOperationItem.getOpid());
- if (Objects.isNull(patMedOperation)) {
+ PatMedOperation patMedOperationVo = new PatMedOperation();
+ PatMedOperation patMedOperation = new PatMedOperation();
+ patMedOperationVo.setOpid(patMedOperationItem.getOpid());
+ List<PatMedOperation> patMedOperationList = patMedOperationMapper.selectPatMedOperationList(patMedOperationVo);
+ if (CollectionUtils.isEmpty(patMedOperationList)) {
return;
+ }else {
+ patMedOperation = patMedOperationList.get(0);
}
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperation.getPatid());
if (Objects.isNull(patArchive)) {
@@ -1167,7 +1172,8 @@
}
}
- private void addOperationSubTask(String config) {
+ @Override
+ public void addOperationSubTask(String config) {
// 鎵嬫湳闅忚
PatMedOperationItem pmoi = new PatMedOperationItem();
//鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 09add5e..0354204 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1423,7 +1423,7 @@
Boolean addMianTableFalg = true;
for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) {
PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
- patMedOperationItem.setOpid(patMedOperation.getId());
+ patMedOperationItem.setOpid(patMedOperation.getOpid());
patMedOperationItem.setOpcode(externalOperationDetail.getShouShuMCID());
patMedOperationItem.setOpdesc(externalOperationDetail.getShouShuMC());
patMedOperationItem.setMainFlag(externalOperationDetail.getZhuShouSBZ());
--
Gitblit v1.9.3