From 4cccaf33dd171c20b6c262467f24706e3d175aab Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 二月 2025 18:15:09 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/PatMedOperation.java | 67 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java | 2
smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java | 120 +++-
smartor/src/main/java/com/smartor/service/IPatMedOperationService.java | 10
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 25 +
smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml | 123 ++++
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java | 26
smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java | 27
smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java | 97 ++-
smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml | 44 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java | 2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 8
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 37 +
smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml | 470 +++++++++++-----------
smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java | 5
smartor/src/main/java/com/smartor/mapper/ServiceTaskoperMapper.java | 2
smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java | 183 +++++++
18 files changed, 828 insertions(+), 422 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
index fb77ac6..52eba37 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
@@ -1,26 +1,33 @@
package com.ruoyi.web.controller.smartor;
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatMedOperation;
import com.smartor.service.IPatMedOperationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
/**
* 鎮ｈ�呮墜鏈褰旵ontroller
*
* @author lihu
- * @date 2025-02-21
+ * @date 2025-02-25
*/
@Api("鎮ｈ�呮墜鏈褰�")
@RestController
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
index 792425b..a9fddf2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
@@ -27,7 +27,7 @@
* 鎮ｈ�呮鏌ユ楠岃褰曞瓙Controller
*
* @author lihu
- * @date 2025-02-21
+ * @date 2025-02-25
*/
@Api("鎮ｈ�呮鏌ユ楠岃褰曞瓙")
@RestController
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
index f9ea895..df4a3da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
@@ -27,7 +27,7 @@
* 妯℃澘绉戝鍏宠仈Controller
*
* @author lihu
- * @date 2025-02-24
+ * @date 2025-02-25
*/
@Api("妯℃澘绉戝鍏宠仈")
@RestController
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index f4f271c..ab247f4 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -238,6 +238,14 @@
iPatMedInhospService.dealOutHospInfo();
}
+
+ /**
+ * 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
+ */
+ public void dealOperationInfo() {
+ iPatMedInhospService.dealOutHospInfo();
+ }
+
/**
* 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
*/
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
index f432488..36ef2ff 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
@@ -13,7 +13,7 @@
* 鎮ｈ�呮墜鏈褰曞璞� pat_med_operation
*
* @author lihu
- * @date 2025-02-21
+ * @date 2025-02-25
*/
@Data
@ApiModel("鎮ｈ�呮墜鏈褰�")
@@ -71,18 +71,18 @@
private String opsstatus;
/**
- * 鎵嬫湳浠ｇ爜
+ * 鎵嬫湳绫诲埆浠ｇ爜
*/
- @ApiModelProperty("鎵嬫湳浠ｇ爜")
- @Excel(name = "鎵嬫湳浠ｇ爜")
- private String operationcode;
+ @ApiModelProperty("鎵嬫湳绫诲埆浠ｇ爜")
+ @Excel(name = "鎵嬫湳绫诲埆浠ｇ爜")
+ private String optypecode;
/**
- * 鎵嬫湳鍚嶇О
+ * 鎵嬫湳绫诲埆鍚嶇О
*/
- @ApiModelProperty("鎵嬫湳鍚嶇О")
- @Excel(name = "鎵嬫湳鍚嶇О")
- private String operationname;
+ @ApiModelProperty("鎵嬫湳绫诲埆鍚嶇О")
+ @Excel(name = "鎵嬫湳绫诲埆鍚嶇О")
+ private String optypename;
/**
* 瑕佹眰鎵嬫湳鏃堕棿
@@ -438,5 +438,54 @@
@Excel(name = "鎶ゅ＋濮撳悕")
private String nurseName;
+ /**
+ * 闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触
+ */
+ @ApiModelProperty("闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触")
+ @Excel(name = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞� 1澶勭悊鎴愬姛 2澶勭悊澶辫触")
+ private String checkFlag;
+
+ /**
+ * 闀挎湡浠诲姟 锛屽け璐ュ師鍥�
+ */
+ @ApiModelProperty("闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ @Excel(name = "闀挎湡浠诲姟 锛屽け璐ュ師鍥�")
+ private String longTaskReason;
+
+ /**
+ * 鎵嬫湳id
+ */
+ @ApiModelProperty("鎵嬫湳id")
+ @Excel(name = "鎵嬫湳id")
+ private String opid;
+
+ /**
+ * 鎵嬫湳鍚嶇ОID
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇ОID")
+ @Excel(name = "鎵嬫湳鍚嶇ОID")
+ private String opcode;
+
+ /**
+ * 鎵嬫湳鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇О")
+ @Excel(name = "鎵嬫湳鍚嶇О")
+ private String opdesc;
+
+ /**
+ * 鎵嬫湳绾у埆浠ｇ爜
+ */
+ @ApiModelProperty("鎵嬫湳绾у埆浠ｇ爜")
+ @Excel(name = "鎵嬫湳绾у埆浠ｇ爜")
+ private String oplevelcode;
+
+ /**
+ * 鎵嬫湳绾у埆鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳绾у埆鍚嶇О")
+ @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
+ private String opleveldesc;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
index 9b61a28..0858d12 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -13,98 +13,138 @@
* 鎮ｈ�呮鏌ユ楠岃褰曞瓙瀵硅薄 pat_med_operation_item
*
* @author lihu
- * @date 2025-02-21
+ * @date 2025-02-25
*/
@Data
@ApiModel("鎮ｈ�呮鏌ユ楠岃褰曞瓙")
-public class PatMedOperationItem extends BaseEntity
- {
-private static final long serialVersionUID = 1L;
+public class PatMedOperationItem extends BaseEntity {
+ private static final long serialVersionUID = 1L;
- /** 鑷ID */
+ /**
+ * 鑷ID
+ */
@ApiModelProperty("鑷ID")
- //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
private Long id;
- /** 鎵嬫湳涓昏〃id */
- @ApiModelProperty("鎵嬫湳涓昏〃id")
- @Excel(name = "鎵嬫湳涓昏〃id")
+ /**
+ * 鎵嬫湳鐢宠鍗昳d
+ */
+ @ApiModelProperty("鎵嬫湳鐢宠鍗昳d")
+ @Excel(name = "鎵嬫湳鐢宠鍗昳d")
+ private Long operationid;
+
+ /**
+ * 鎵嬫湳id
+ */
+ @ApiModelProperty("鎵嬫湳id")
+ @Excel(name = "鎵嬫湳id")
private Long opid;
- /** 鎵嬫湳鍚嶇ОID */
+ /**
+ * 鎵嬫湳鍚嶇ОID
+ */
@ApiModelProperty("鎵嬫湳鍚嶇ОID")
- @Excel(name = "鎵嬫湳鍚嶇ОID")
+ @Excel(name = "鎵嬫湳鍚嶇ОID")
private String opcode;
- /** 鎵嬫湳鍚嶇О */
+ /**
+ * 鎵嬫湳鍚嶇О
+ */
@ApiModelProperty("鎵嬫湳鍚嶇О")
- @Excel(name = "鎵嬫湳鍚嶇О")
+ @Excel(name = "鎵嬫湳鍚嶇О")
private String opdesc;
- /** 涓绘墜鏈爣璇� */
+ /**
+ * 涓绘墜鏈爣璇�
+ */
@ApiModelProperty("涓绘墜鏈爣璇�")
- @Excel(name = "涓绘墜鏈爣璇�")
+ @Excel(name = "涓绘墜鏈爣璇�")
private String mainFlag;
- /** 鍒囧彛绫诲埆浠ｇ爜 */
+ /**
+ * 鍒囧彛绫诲埆浠ｇ爜
+ */
@ApiModelProperty("鍒囧彛绫诲埆浠ｇ爜")
- @Excel(name = "鍒囧彛绫诲埆浠ｇ爜")
+ @Excel(name = "鍒囧彛绫诲埆浠ｇ爜")
private String incitypecode;
- /** 鍒囧彛绫诲埆鍚嶇О */
+ /**
+ * 鍒囧彛绫诲埆鍚嶇О
+ */
@ApiModelProperty("鍒囧彛绫诲埆鍚嶇О")
- @Excel(name = "鍒囧彛绫诲埆鍚嶇О")
+ @Excel(name = "鍒囧彛绫诲埆鍚嶇О")
private String incitypedesc;
- /** 鎵嬫湳绾у埆浠ｇ爜 */
+ /**
+ * 鎵嬫湳绾у埆浠ｇ爜
+ */
@ApiModelProperty("鎵嬫湳绾у埆浠ｇ爜")
- @Excel(name = "鎵嬫湳绾у埆浠ｇ爜")
+ @Excel(name = "鎵嬫湳绾у埆浠ｇ爜")
private String oplevelcode;
- /** 鎵嬫湳绾у埆鍚嶇О */
+ /**
+ * 鎵嬫湳绾у埆鍚嶇О
+ */
@ApiModelProperty("鎵嬫湳绾у埆鍚嶇О")
- @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
+ @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
private String opleveldesc;
- /** 鎵嬫湳閮ㄤ綅 */
+ /**
+ * 鎵嬫湳閮ㄤ綅
+ */
@ApiModelProperty("鎵嬫湳閮ㄤ綅")
- @Excel(name = "鎵嬫湳閮ㄤ綅")
+ @Excel(name = "鎵嬫湳閮ㄤ綅")
private String opposition;
- /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+ */
@ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
private String delFlag;
- /** 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛� */
+ /**
+ * 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�
+ */
@ApiModelProperty("涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�")
- @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
+ @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
private Long isupload;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
@ApiModelProperty("涓婁紶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date uploadTime;
- /** 鍖婚櫌鏈烘瀯ID */
+ /**
+ * 鍖婚櫌鏈烘瀯ID
+ */
@ApiModelProperty("鍖婚櫌鏈烘瀯ID")
- @Excel(name = "鍖婚櫌鏈烘瀯ID")
+ @Excel(name = "鍖婚櫌鏈烘瀯ID")
private String orgid;
- /** 鐖禛UID */
+ /**
+ * 鐖禛UID
+ */
@ApiModelProperty("鐖禛UID")
- @Excel(name = "鐖禛UID")
+ @Excel(name = "鐖禛UID")
private String pguid;
- /** GUID */
+ /**
+ * GUID
+ */
@ApiModelProperty("GUID")
- @Excel(name = "GUID")
+ @Excel(name = "GUID")
private String guid;
- /** 鐖禝D */
+ /**
+ * 鐖禝D
+ */
@ApiModelProperty("鐖禝D")
- @Excel(name = "鐖禝D")
+ @Excel(name = "鐖禝D")
private Long pid;
- }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index bcaf9de..e9a8499 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -376,16 +376,30 @@
private Long icd10id;
/**
- * 閮ㄩ棬缂栫爜
+ * 鐤剧梾缂栫爜
*/
- @ApiModelProperty("閮ㄩ棬缂栫爜")
- @Excel(name = "閮ㄩ棬缂栫爜")
+ @ApiModelProperty("鐤剧梾缂栫爜")
+ @Excel(name = "鐤剧梾缂栫爜")
private String icd10code;
/**
- * 閮ㄩ棬鍚嶇О
+ * 鐤剧梾鍚嶇О
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "閮ㄩ棬鍚嶇О")
+ @ApiModelProperty("鐤剧梾鍚嶇О")
+ @Excel(name = "鐤剧梾鍚嶇О")
private String icd10name;
+
+ /**
+ * 鎵嬫湳缂栫爜
+ */
+ @ApiModelProperty("鎵嬫湳缂栫爜")
+ @Excel(name = "鎵嬫湳缂栫爜")
+ private String opcode;
+
+ /**
+ * 鎵嬫湳鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇О")
+ @Excel(name = "鎵嬫湳鍚嶇О")
+ private String opdesc;
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
index 97c9f58..7713fed 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
@@ -10,77 +10,102 @@
* 妯℃澘绉戝鍏宠仈瀵硅薄 service_taskoper
*
* @author lihu
- * @date 2025-02-24
+ * @date 2025-02-25
*/
@Data
@ApiModel("妯℃澘绉戝鍏宠仈")
-public class ServiceTaskoper extends BaseEntity
- {
-private static final long serialVersionUID = 1L;
+public class ServiceTaskoper extends BaseEntity {
+ private static final long serialVersionUID = 1L;
- /** 妯℃澘搴撳拰绉戝鍏宠仈id */
+ /**
+ * 妯℃澘搴撳拰绉戝鍏宠仈id
+ */
@ApiModelProperty("妯℃澘搴撳拰绉戝鍏宠仈id")
- //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
private Long id;
- /** 浠诲姟id */
+ /**
+ * 浠诲姟id
+ */
@ApiModelProperty("浠诲姟id")
- @Excel(name = "浠诲姟id")
+ @Excel(name = "浠诲姟id")
private Long taskId;
- /** 鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸 */
+ /**
+ * 鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸
+ */
@ApiModelProperty("鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸")
- @Excel(name = "鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸")
+ @Excel(name = "鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸")
private Long longtask;
- /** 浠诲姟鍚嶇О */
+ /**
+ * 浠诲姟鍚嶇О
+ */
@ApiModelProperty("浠诲姟鍚嶇О")
- @Excel(name = "浠诲姟鍚嶇О")
+ @Excel(name = "浠诲姟鍚嶇О")
private String taskName;
- /** 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡) */
+ /**
+ * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+ */
@ApiModelProperty("鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
+ @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)")
private String serviceType;
- /** 绉戝id */
- @ApiModelProperty("绉戝id")
- @Excel(name = "绉戝id")
- private Long deptId;
+ /**
+ * 鎵嬫湳id
+ */
+ @ApiModelProperty("鎵嬫湳id")
+ @Excel(name = "鎵嬫湳id")
+ private Long opid;
- /** 閮ㄩ棬缂栫爜 */
- @ApiModelProperty("閮ㄩ棬缂栫爜")
- @Excel(name = "閮ㄩ棬缂栫爜")
- private String deptCode;
+ /**
+ * 鎵嬫湳缂栫爜
+ */
+ @ApiModelProperty("鎵嬫湳缂栫爜")
+ @Excel(name = "鎵嬫湳缂栫爜")
+ private String opcode;
- /** 閮ㄩ棬鍚嶇О */
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "閮ㄩ棬鍚嶇О")
- private String deptName;
+ /**
+ * 鎵嬫湳鍚嶇О
+ */
+ @ApiModelProperty("鎵嬫湳鍚嶇О")
+ @Excel(name = "鎵嬫湳鍚嶇О")
+ private String opdesc;
- /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+ */
@ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
private Integer delFlag;
- /** 鍖婚櫌鏈烘瀯ID */
+ /**
+ * 鍖婚櫌鏈烘瀯ID
+ */
@ApiModelProperty("鍖婚櫌鏈烘瀯ID")
- @Excel(name = "鍖婚櫌鏈烘瀯ID")
+ @Excel(name = "鍖婚櫌鏈烘瀯ID")
private String orgid;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String guid;
- /** 鐖禛UID */
+ /**
+ * 鐖禛UID
+ */
@ApiModelProperty("鐖禛UID")
- @Excel(name = "鐖禛UID")
+ @Excel(name = "鐖禛UID")
private String pguid;
- /** 鐖禝D */
+ /**
+ * 鐖禝D
+ */
@ApiModelProperty("鐖禝D")
- @Excel(name = "鐖禝D")
+ @Excel(name = "鐖禝D")
private Long pid;
- }
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
index 7609e36..614fd61 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
@@ -8,7 +8,7 @@
* 鎮ｈ�呮鏌ユ楠岃褰曞瓙Mapper鎺ュ彛
*
* @author lihu
- * @date 2025-02-21
+ * @date 2025-02-25
*/
@Mapper
public interface PatMedOperationItemMapper
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java
index 3ba33b3..6403aca 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java
@@ -1,15 +1,14 @@
package com.smartor.mapper;
import java.util.List;
-
-import com.smartor.domain.PatMedOperation;
import org.apache.ibatis.annotations.Mapper;
+import com.smartor.domain.PatMedOperation;
/**
* 鎮ｈ�呮墜鏈褰昅apper鎺ュ彛
*
* @author lihu
- * @date 2025-02-21
+ * @date 2025-02-25
*/
@Mapper
public interface PatMedOperationMapper
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceTaskoperMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceTaskoperMapper.java
index 4b642e8..f5c34f5 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceTaskoperMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceTaskoperMapper.java
@@ -8,7 +8,7 @@
* 妯℃澘绉戝鍏宠仈Mapper鎺ュ彛
*
* @author lihu
- * @date 2025-02-24
+ * @date 2025-02-25
*/
@Mapper
public interface ServiceTaskoperMapper
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java b/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java
index 4ef5bf6..ea0f8cb 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java
@@ -10,8 +10,7 @@
* @author lihu
* @date 2025-02-21
*/
-public interface IPatMedOperationService
-{
+public interface IPatMedOperationService {
/**
* 鏌ヨ鎮ｈ�呮墜鏈褰�
*
@@ -59,4 +58,11 @@
* @return 缁撴灉
*/
public int deletePatMedOperationById(Long id);
+
+ /**
+ * 澶勭悊鎵嬫湳淇℃伅
+ *
+ * @return
+ */
+ public int dealOperationInfo();
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
index 76569fb..7c8c18f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
@@ -1,11 +1,17 @@
package com.smartor.service.impl;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
+
import com.ruoyi.common.utils.DateUtils;
-import com.smartor.domain.PatMedOperation;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.smartor.domain.*;
+import com.smartor.mapper.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.smartor.mapper.PatMedOperationMapper;
import com.smartor.service.IPatMedOperationService;
/**
@@ -14,11 +20,19 @@
* @author lihu
* @date 2025-02-21
*/
+@Slf4j
@Service
-public class PatMedOperationServiceImpl implements IPatMedOperationService
-{
+public class PatMedOperationServiceImpl implements IPatMedOperationService {
@Autowired
private PatMedOperationMapper patMedOperationMapper;
+ @Autowired
+ private PatArchiveMapper patArchiveMapper;
+ @Autowired
+ private ServiceTaskoperMapper serviceTaskoperMapper;
+ @Autowired
+ private ServiceTaskMapper serviceTaskMapper;
+ @Autowired
+ private ServiceSubtaskMapper serviceSubtaskMapper;
/**
* 鏌ヨ鎮ｈ�呮墜鏈褰�
@@ -27,8 +41,7 @@
* @return 鎮ｈ�呮墜鏈褰�
*/
@Override
- public PatMedOperation selectPatMedOperationById(Long id)
- {
+ public PatMedOperation selectPatMedOperationById(Long id) {
return patMedOperationMapper.selectPatMedOperationById(id);
}
@@ -39,8 +52,7 @@
* @return 鎮ｈ�呮墜鏈褰�
*/
@Override
- public List<PatMedOperation> selectPatMedOperationList(PatMedOperation patMedOperation)
- {
+ public List<PatMedOperation> selectPatMedOperationList(PatMedOperation patMedOperation) {
return patMedOperationMapper.selectPatMedOperationList(patMedOperation);
}
@@ -51,8 +63,7 @@
* @return 缁撴灉
*/
@Override
- public int insertPatMedOperation(PatMedOperation patMedOperation)
- {
+ public int insertPatMedOperation(PatMedOperation patMedOperation) {
patMedOperation.setCreateTime(DateUtils.getNowDate());
return patMedOperationMapper.insertPatMedOperation(patMedOperation);
}
@@ -64,8 +75,7 @@
* @return 缁撴灉
*/
@Override
- public int updatePatMedOperation(PatMedOperation patMedOperation)
- {
+ public int updatePatMedOperation(PatMedOperation patMedOperation) {
patMedOperation.setUpdateTime(DateUtils.getNowDate());
return patMedOperationMapper.updatePatMedOperation(patMedOperation);
}
@@ -77,8 +87,7 @@
* @return 缁撴灉
*/
@Override
- public int deletePatMedOperationByIds(Long[] ids)
- {
+ public int deletePatMedOperationByIds(Long[] ids) {
return patMedOperationMapper.deletePatMedOperationByIds(ids);
}
@@ -89,8 +98,148 @@
* @return 缁撴灉
*/
@Override
- public int deletePatMedOperationById(Long id)
- {
+ public int deletePatMedOperationById(Long id) {
return patMedOperationMapper.deletePatMedOperationById(id);
}
+
+ @Override
+ public int dealOperationInfo() {
+ PatMedOperation patMedOperation = new PatMedOperation();
+ //鑾峰彇闇�瑕佸嚭闄㈤殢璁匡紝鏈鐞嗙殑鏁版嵁
+ patMedOperation.setCheckFlag("0");
+ List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
+ log.error("dealOperationInfo闇�瑕佸鐞嗙殑鎵嬫湳淇℃伅锛歿}", patMedOperations);
+
+ for (PatMedOperation patMedOperation1 : patMedOperations) {
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperation1.getPatid());
+ try {
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ユ墜鏈紪鐮佸搴旂殑闀挎湡浠诲姟
+ ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+ serviceTaskoper.setLongtask(1L);
+ serviceTaskoper.setOpcode(patMedOperation1.getOpcode());
+ List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�2 锛宭ong_task_reason 璁板綍鍘熷洜锛�
+ if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
+ patMedOperation1.setCheckFlag("2");
+ patMedOperation1.setLongTaskReason("璇ユ墜鏈紪鐮侊紝鏈厤缃暱鏈熶换鍔�;");
+ patMedOperationMapper.updatePatMedOperation(patMedOperation1);
+ continue;
+ } else if (serviceTaskopers.size() > 1) {
+ //濡傛灉鏌ヨ鍑哄涓换鍔★紝閭ｅ氨鍙栫涓�涓紝骞跺湪鎮ｈ�呭娉ㄤ竴涓�
+ List<Long> taskIds = serviceTaskopers.stream().map(ServiceTaskoper::getTaskId).collect(Collectors.toList());
+ patMedOperation1.setLongTaskReason("璇ユ墜鏈紪鐮侊紝鏈夊涓殢璁块暱鏈熶换鍔�:" + taskIds);
+ patMedOperationMapper.updatePatMedOperation(patMedOperation1);
+ ServiceTaskoper serviceTaskoper1 = serviceTaskopers.get(0);
+ serviceTaskopers = new ArrayList<>();
+ serviceTaskopers.add(serviceTaskoper1);
+ }
+
+ writeInSubTask(serviceTaskopers.get(0).getTaskId(), true, patMedOperation1, patArchive);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ }
+ }
+
+ return 1;
+ }
+
+ //灏嗘偅鑰呮斁鍒皊ubtask涓�
+ private void writeInSubTask(Long taskid, Boolean check, PatMedOperation patMedOperation1, PatArchive patArchive) {
+ String longTaskReason = patMedOperation1.getLongTaskReason();
+ if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
+// Long taskid = std.getTaskId();
+ ServiceTask st = new ServiceTask();
+ st.setTaskid(taskid);
+ st.setSendState(2L);
+ List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
+ if (CollectionUtils.isEmpty(serviceTasks)) {
+ log.error("璇ユ墜鏈紪鐮侀暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
+ patMedOperation1.setCheckFlag("2");
+ patMedOperation1.setLongTaskReason(longTaskReason + " & 璇ユ墜鏈紪鐮侀暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ patMedOperationMapper.updatePatMedOperation(patMedOperation1);
+ return;
+ }
+ ServiceTask serviceTask = serviceTasks.get(0);
+
+ //灏佽serviceSubtask
+ ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedOperation1, patArchive);
+ int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+
+ if (i == 1) {
+ //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
+ PatMedOperation patMedOperation = new PatMedOperation();
+ patMedOperation.setId(patMedOperation1.getId());
+ patMedOperation.setCheckFlag("1");
+ patMedOperationMapper.updatePatMedOperation(patMedOperation);
+ } else {
+ //鐢熸垚瀛愪换鍔″け璐ワ紝
+ log.error("鐢熸垚瀛愪换鍔″け璐erviceSubtask涓猴細{}", serviceSubtask);
+ PatMedOperation patMedOperation = new PatMedOperation();
+ patMedOperation.setId(patMedOperation1.getId());
+ patMedOperation.setRemark("鐢熸垚瀛愪换鍔″け璐�");
+ patMedOperationMapper.updatePatMedOperation(patMedOperation);
+ }
+ }
+
+ //灏佽serviceSubtask
+ private ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedOperation patMedOperation1, PatArchive patArchive) {
+ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
+ serviceSubtask.setTaskid(serviceTask.getTaskid());
+ if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
+ serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
+ serviceSubtask.setNurseId(patMedOperation1.getNurseId());
+ serviceSubtask.setNurseName(patMedOperation1.getNurseName());
+// serviceSubtask.setInhospid(patMedOperation1.getInhospid());
+ serviceSubtask.setDrcode(patMedOperation1.getDrcode());
+ serviceSubtask.setDrname(patMedOperation1.getDrname());
+ serviceSubtask.setDeptcode(patMedOperation1.getDeptcode());
+ serviceSubtask.setDeptname(patMedOperation1.getDeptname());
+ serviceSubtask.setTemplateid(serviceTask.getTemplateid());
+ serviceSubtask.setTemplatename(serviceTask.getTemplatename());
+ serviceSubtask.setPatid(patArchive.getId());
+ serviceSubtask.setSendname(patArchive.getName());
+ serviceSubtask.setSfzh(patArchive.getIdcardno());
+ serviceSubtask.setPhone(patArchive.getTelcode());
+ if (StringUtils.isBlank(patArchive.getTelcode())) serviceSubtask.setPhone(patArchive.getRelativetelcode());
+ serviceSubtask.setSex(patArchive.getSex());
+ serviceSubtask.setAge(patArchive.getAge());
+ serviceSubtask.setSendstate(2L);
+ serviceSubtask.setStarttime(patMedOperation1.getOpreqtime());
+ serviceSubtask.setEndtime(patMedOperation1.getOpreqtime());
+ serviceSubtask.setServiceType("2");
+ serviceSubtask.setPreachform(serviceTask.getPreachform());
+ serviceSubtask.setHospType("2");
+ serviceSubtask.setCreateTime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+// serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
+// serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
+// serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
+ //璁剧疆鍙戦�佹椂闂�
+ if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
+ Date newDate = addDays(patMedOperation1.getOpreqtime(), serviceTask.getSendDay().intValue());
+ serviceSubtask.setLongSendTime(newDate);
+ //鎮ｈ�呭彂閫佹椂闂�
+ if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
+ String remark = patArchive.getNotrequiredreason();
+ serviceSubtask.setRemark(remark);
+ serviceSubtask.setResult("error");
+ serviceSubtask.setFinishtime(new Date());
+ //涓嶆墽琛�
+ serviceSubtask.setSendstate(4L);
+ }
+ return serviceSubtask;
+ }
+
+ private Date addDays(Date date, Integer days) {
+ if (days == null) {
+ days = 1;
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.DAY_OF_MONTH, days);
+ return calendar.getTime();
+ }
}
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 09fcb1a..30ea393 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -395,6 +395,9 @@
Map<String, Object> BingRenXX = (Map<String, Object>) yeWuXX.get("BingRenXX");
ExternalInHospPatientInfo externalInHospPatientInfo = BeanUtil.mapToBean(BingRenXX, ExternalInHospPatientInfo.class, true);
+ PatArchive patArchive = addPatArchive(externalInHospPatientInfo, null, null);
+
+
//鎵嬫湳淇℃伅鏂板
Map<String, Object> ssxx = (Map<String, Object>) yeWuXX.get("ShouShuSQ");
//鎵嬫湳鏇存柊
@@ -409,7 +412,7 @@
else if (ObjectUtils.isNotEmpty(sscx))
externalOperationInfo = BeanUtil.mapToBean(sscx, ExternalOperationInfo.class, true);
PatMedOperation patMedOperation = new PatMedOperation();
- patMedOperation.setPatid(null);
+ patMedOperation.setPatid(patArchive.getId());
patMedOperation.setPatcode(externalInHospPatientInfo.getBingRenID());
patMedOperation.setPaname(externalInHospPatientInfo.getXingMing());
// patMedOperation.setOpreqid(externalOperationInfo.getShenQingDID());
@@ -418,8 +421,8 @@
List<PatMedOperation> patMedOperations = patMedOperationMapper.selectPatMedOperationList(patMedOperation);
patMedOperation.setOpsstatus(null);
- patMedOperation.setOperationcode(externalOperationInfo.getShouShuLBDM());
- patMedOperation.setOperationname(externalOperationInfo.getShouShuLBMC());
+ patMedOperation.setOptypecode(externalOperationInfo.getShouShuLBDM());
+ patMedOperation.setOptypename(externalOperationInfo.getShouShuLBMC());
patMedOperation.setOperatortime(externalOperationInfo.getYaoQiuSJ());
patMedOperation.setOpreqtime(externalOperationInfo.getShenQingSJ());
patMedOperation.setReqdoccode(externalOperationInfo.getShenQingYSID());
@@ -470,6 +473,12 @@
if (CollectionUtils.isNotEmpty(patMedOperations)) {
Long id = patMedOperations.get(0).getId();
patMedOperation.setId(id);
+ patMedOperation.setCheckFlag(patMedOperations.get(0).getCheckFlag());
+ //濡傛灉鎵嬫湳鎾ら攢锛岀洿鎺ュ垹闄よ鏉℃墜鏈俊鎭�
+ if (ObjectUtils.isNotEmpty(sscx)) {
+ patMedOperation.setDelFlag("1");
+ //鍚屾椂鍘绘煡璇紝鏄惁鍦╯ubtask涓敓鎴愪换鍔★紝濡傛灉鐢熸垚鍑哄緱绔嬮┈鍒犻櫎
+ }
patMedOperationMapper.updatePatMedOperation(patMedOperation);
} else patMedOperationMapper.insertPatMedOperation(patMedOperation);
log.error("-----patMedOperation鐨勪富閿甶d涓猴細{}", patMedOperation.getId());
@@ -477,6 +486,8 @@
if (ObjectUtils.isNotEmpty(ssxx)) {
Map<String, Object> ShouShuMXList = (Map<String, Object>) ssxx.get("ShouShuMXList");
List<ExternalOperationDetail> externalOperationDetails = BeanUtil.mapToBean(ShouShuMXList, List.class, true);
+ //addMianTableFalg鏄惁闇�瑕佸皢涓绘墜鏈殑淇℃伅鏀惧埌PatMedOperation琛ㄤ腑锛堝彧鏈夌涓�涓富鎵嬫湳淇℃伅闇�瑕佹斁锛屽悗闈㈢殑閮戒笉闇�瑕佹斁浜嗭紝涔熷氨鏄锛岀涓�涓斁瀹屽悗锛屽氨瑕佹妸杩欎釜flag鏀规垚false锛�
+ Boolean addMianTableFalg = true;
for (ExternalOperationDetail externalOperationDetail : externalOperationDetails) {
PatMedOperationItem patMedOperationItem = new PatMedOperationItem();
patMedOperationItem.setOpid(patMedOperation.getId());
@@ -490,6 +501,14 @@
patMedOperationItem.setOpposition(externalOperationDetail.getShouShuBW());
patMedOperationItem.setDelFlag("0");
patMedOperationItem.setOrgid(patMedOperation.getOrgid());
+ if (externalOperationDetail.getZhuShouSBZ().equals("1") && addMianTableFalg == true) {
+ patMedOperation.setOpcode(externalOperationDetail.getShouShuMCID());
+ patMedOperation.setOpdesc(externalOperationDetail.getShouShuMC());
+// patMedOperation.setOpid(externalOperationDetail.getShouShuJBDM());
+ patMedOperationMapper.updatePatMedOperation(patMedOperation);
+ addMianTableFalg = false;
+ }
+
patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index d22dc99..3a3416b 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -69,6 +69,9 @@
private IServiceTaskdiagService serviceTaskdiagService;
@Autowired
+ private IServiceTaskoperService serviceTaskoperService;
+
+ @Autowired
private RedisCache redisCache;
@Autowired
@@ -383,7 +386,27 @@
if (serviceTaskVO.getLongTask() == 1L) {
serviceTask.setSendState(2L);
serviceTaskService.insertServiceTask(serviceTask);
- if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
+ if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+ serviceTaskdiag.setTaskId(serviceTask.getTaskid());
+ serviceTaskdiag.setTaskName(serviceTask.getTaskName());
+ serviceTaskdiag.setLongtask(1L);
+ serviceTaskdiag.setGuid(serviceTask.getGuid());
+ serviceTaskdiag.setOrgid(serviceTask.getOrgid());
+ serviceTaskdiag.setCreateTime(new Date());
+ serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ } else if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
+ ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+ serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
+ serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
+ serviceTaskoper.setTaskId(serviceTask.getTaskid());
+ serviceTaskoper.setTaskName(serviceTask.getTaskName());
+ serviceTaskoper.setLongtask(1L);
+ serviceTaskoper.setGuid(serviceTask.getGuid());
+ serviceTaskoper.setOrgid(serviceTask.getOrgid());
+ serviceTaskoper.setCreateTime(new Date());
+ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ } else {
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
serviceTaskdept.setTaskId(serviceTask.getTaskid());
serviceTaskdept.setTaskName(serviceTask.getTaskName());
@@ -410,16 +433,6 @@
serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
}
}
-
- } else {
- ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
- serviceTaskdiag.setTaskId(serviceTask.getTaskid());
- serviceTaskdiag.setTaskName(serviceTask.getTaskName());
- serviceTaskdiag.setLongtask(1L);
- serviceTaskdiag.setGuid(serviceTask.getGuid());
- serviceTaskdiag.setOrgid(serviceTask.getOrgid());
- if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
- serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
}
if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
@@ -1889,6 +1902,7 @@
serviceSubtask.setRemark("鐢佃瘽鎷ㄦ墦宸插畬鎴�");
serviceSubtask.setSendstate(6L);
serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
+ serviceSubtask.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
//涓嬭浇鏂囦欢
ftpService.downloadFolder("/" + LocalDate.now().toString(), profile + "/upload/vadio/voice/" + LocalDate.now().toString());
@@ -1901,6 +1915,7 @@
serviceSubtask.setRemark("鐢佃瘽鎺ラ�氭垚鍔燂紝鎮ｈ�呮嫆缁濋殢璁�");
serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
serviceSubtask.setSendstate(6L);
+ serviceSubtask.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
int startIndex = phoneCallRecordVO.getRecord_path().indexOf("voice") + "voice".length() + 1; // 鍔�1鏄烦杩�/绗﹀彿
int endIndex = phoneCallRecordVO.getRecord_path().lastIndexOf("/");
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
index db3b5bf..afc4fc1 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -5,51 +5,32 @@
<mapper namespace="com.smartor.mapper.PatMedOperationItemMapper">
<resultMap type="com.smartor.domain.PatMedOperationItem" id="PatMedOperationItemResult">
- <result property="id" column="id"/>
- <result property="opid" column="opid"/>
- <result property="opcode" column="opcode"/>
- <result property="opdesc" column="opdesc"/>
- <result property="mainFlag" column="main_flag"/>
- <result property="incitypecode" column="incitypecode"/>
- <result property="incitypedesc" column="incitypedesc"/>
- <result property="oplevelcode" column="oplevelcode"/>
- <result property="opleveldesc" column="opleveldesc"/>
- <result property="opposition" column="opposition"/>
- <result property="delFlag" column="del_flag"/>
- <result property="updateBy" column="update_by"/>
- <result property="updateTime" column="update_time"/>
- <result property="createBy" column="create_by"/>
- <result property="createTime" column="create_time"/>
- <result property="isupload" column="isupload"/>
- <result property="uploadTime" column="upload_time"/>
- <result property="orgid" column="orgid"/>
- <result property="pguid" column="pguid"/>
- <result property="guid" column="guid"/>
- <result property="pid" column="pid"/>
+ <result property="id" column="id"/>
+ <result property="operationid" column="operationid"/>
+ <result property="opid" column="opid"/>
+ <result property="opcode" column="opcode"/>
+ <result property="opdesc" column="opdesc"/>
+ <result property="mainFlag" column="main_flag"/>
+ <result property="incitypecode" column="incitypecode"/>
+ <result property="incitypedesc" column="incitypedesc"/>
+ <result property="oplevelcode" column="oplevelcode"/>
+ <result property="opleveldesc" column="opleveldesc"/>
+ <result property="opposition" column="opposition"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="orgid" column="orgid"/>
+ <result property="pguid" column="pguid"/>
+ <result property="guid" column="guid"/>
+ <result property="pid" column="pid"/>
</resultMap>
<sql id="selectPatMedOperationItemVo">
- select id,
- opid,
- opcode,
- opdesc,
- main_flag,
- incitypecode,
- incitypedesc,
- oplevelcode,
- opleveldesc,
- opposition,
- del_flag,
- update_by,
- update_time,
- create_by,
- create_time,
- isupload,
- upload_time,
- orgid,
- pguid,
- guid,
- pid
+ select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid
from pat_med_operation_item
</sql>
@@ -57,230 +38,239 @@
resultMap="PatMedOperationItemResult">
<include refid="selectPatMedOperationItemVo"/>
<where>
- <if test="opid != null ">
- and opid = #{opid}
- </if>
- <if test="opcode != null and opcode != ''">
- and opcode = #{opcode}
- </if>
- <if test="opdesc != null and opdesc != ''">
- and opdesc = #{opdesc}
- </if>
- <if test="mainFlag != null and mainFlag != ''">
- and main_flag = #{mainFlag}
- </if>
- <if test="incitypecode != null and incitypecode != ''">
- and incitypecode = #{incitypecode}
- </if>
- <if test="incitypedesc != null and incitypedesc != ''">
- and incitypedesc = #{incitypedesc}
- </if>
- <if test="oplevelcode != null and oplevelcode != ''">
- and oplevelcode = #{oplevelcode}
- </if>
- <if test="opleveldesc != null and opleveldesc != ''">
- and opleveldesc = #{opleveldesc}
- </if>
- <if test="opposition != null and opposition != ''">
- and opposition = #{opposition}
- </if>
- <if test="isupload != null ">
- and isupload = #{isupload}
- </if>
- <if test="uploadTime != null ">
- and upload_time = #{uploadTime}
- </if>
- <if test="orgid != null and orgid != ''">
- and orgid = #{orgid}
- </if>
- <if test="pguid != null and pguid != ''">
- and pguid = #{pguid}
- </if>
- <if test="guid != null and guid != ''">
- and guid = #{guid}
- </if>
- <if test="pid != null ">
- and pid = #{pid}
- </if>
+ <if test="operationid != null ">
+ and operationid = #{operationid}
+ </if>
+ <if test="opid != null ">
+ and opid = #{opid}
+ </if>
+ <if test="opcode != null and opcode != ''">
+ and opcode = #{opcode}
+ </if>
+ <if test="opdesc != null and opdesc != ''">
+ and opdesc = #{opdesc}
+ </if>
+ <if test="mainFlag != null and mainFlag != ''">
+ and main_flag = #{mainFlag}
+ </if>
+ <if test="incitypecode != null and incitypecode != ''">
+ and incitypecode = #{incitypecode}
+ </if>
+ <if test="incitypedesc != null and incitypedesc != ''">
+ and incitypedesc = #{incitypedesc}
+ </if>
+ <if test="oplevelcode != null and oplevelcode != ''">
+ and oplevelcode = #{oplevelcode}
+ </if>
+ <if test="opleveldesc != null and opleveldesc != ''">
+ and opleveldesc = #{opleveldesc}
+ </if>
+ <if test="opposition != null and opposition != ''">
+ and opposition = #{opposition}
+ </if>
+ <if test="isupload != null ">
+ and isupload = #{isupload}
+ </if>
+ <if test="uploadTime != null ">
+ and upload_time = #{uploadTime}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="pguid != null and pguid != ''">
+ and pguid = #{pguid}
+ </if>
+ <if test="guid != null and guid != ''">
+ and guid = #{guid}
+ </if>
+ <if test="pid != null ">
+ and pid = #{pid}
+ </if>
</where>
</select>
<select id="selectPatMedOperationItemById" parameterType="Long"
resultMap="PatMedOperationItemResult">
- <include refid="selectPatMedOperationItemVo"/>
- where id = #{id}
+ <include refid="selectPatMedOperationItemVo"/>
+ where id = #{id}
</select>
- <insert id="insertPatMedOperationItem" parameterType="com.smartor.domain.PatMedOperationItem"
- useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertPatMedOperationItem" parameterType="com.smartor.domain.PatMedOperationItem">
insert into pat_med_operation_item
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,
- </if>
- <if test="opid != null">opid,
- </if>
- <if test="opcode != null">opcode,
- </if>
- <if test="opdesc != null">opdesc,
- </if>
- <if test="mainFlag != null">main_flag,
- </if>
- <if test="incitypecode != null">incitypecode,
- </if>
- <if test="incitypedesc != null">incitypedesc,
- </if>
- <if test="oplevelcode != null">oplevelcode,
- </if>
- <if test="opleveldesc != null">opleveldesc,
- </if>
- <if test="opposition != null">opposition,
- </if>
- <if test="delFlag != null">del_flag,
- </if>
- <if test="updateBy != null">update_by,
- </if>
- <if test="updateTime != null">update_time,
- </if>
- <if test="createBy != null">create_by,
- </if>
- <if test="createTime != null">create_time,
- </if>
- <if test="isupload != null">isupload,
- </if>
- <if test="uploadTime != null">upload_time,
- </if>
- <if test="orgid != null">orgid,
- </if>
- <if test="pguid != null">pguid,
- </if>
- <if test="guid != null">guid,
- </if>
- <if test="pid != null">pid,
- </if>
+ <if test="id != null">id,
+ </if>
+ <if test="operationid != null">operationid,
+ </if>
+ <if test="opid != null">opid,
+ </if>
+ <if test="opcode != null">opcode,
+ </if>
+ <if test="opdesc != null">opdesc,
+ </if>
+ <if test="mainFlag != null">main_flag,
+ </if>
+ <if test="incitypecode != null">incitypecode,
+ </if>
+ <if test="incitypedesc != null">incitypedesc,
+ </if>
+ <if test="oplevelcode != null">oplevelcode,
+ </if>
+ <if test="opleveldesc != null">opleveldesc,
+ </if>
+ <if test="opposition != null">opposition,
+ </if>
+ <if test="delFlag != null">del_flag,
+ </if>
+ <if test="updateBy != null">update_by,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="createBy != null">create_by,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="isupload != null">isupload,
+ </if>
+ <if test="uploadTime != null">upload_time,
+ </if>
+ <if test="orgid != null">orgid,
+ </if>
+ <if test="pguid != null">pguid,
+ </if>
+ <if test="guid != null">guid,
+ </if>
+ <if test="pid != null">pid,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id},
- </if>
- <if test="opid != null">#{opid},
- </if>
- <if test="opcode != null">#{opcode},
- </if>
- <if test="opdesc != null">#{opdesc},
- </if>
- <if test="mainFlag != null">#{mainFlag},
- </if>
- <if test="incitypecode != null">#{incitypecode},
- </if>
- <if test="incitypedesc != null">#{incitypedesc},
- </if>
- <if test="oplevelcode != null">#{oplevelcode},
- </if>
- <if test="opleveldesc != null">#{opleveldesc},
- </if>
- <if test="opposition != null">#{opposition},
- </if>
- <if test="delFlag != null">#{delFlag},
- </if>
- <if test="updateBy != null">#{updateBy},
- </if>
- <if test="updateTime != null">#{updateTime},
- </if>
- <if test="createBy != null">#{createBy},
- </if>
- <if test="createTime != null">#{createTime},
- </if>
- <if test="isupload != null">#{isupload},
- </if>
- <if test="uploadTime != null">#{uploadTime},
- </if>
- <if test="orgid != null">#{orgid},
- </if>
- <if test="pguid != null">#{pguid},
- </if>
- <if test="guid != null">#{guid},
- </if>
- <if test="pid != null">#{pid},
- </if>
+ <if test="id != null">#{id},
+ </if>
+ <if test="operationid != null">#{operationid},
+ </if>
+ <if test="opid != null">#{opid},
+ </if>
+ <if test="opcode != null">#{opcode},
+ </if>
+ <if test="opdesc != null">#{opdesc},
+ </if>
+ <if test="mainFlag != null">#{mainFlag},
+ </if>
+ <if test="incitypecode != null">#{incitypecode},
+ </if>
+ <if test="incitypedesc != null">#{incitypedesc},
+ </if>
+ <if test="oplevelcode != null">#{oplevelcode},
+ </if>
+ <if test="opleveldesc != null">#{opleveldesc},
+ </if>
+ <if test="opposition != null">#{opposition},
+ </if>
+ <if test="delFlag != null">#{delFlag},
+ </if>
+ <if test="updateBy != null">#{updateBy},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="createBy != null">#{createBy},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="isupload != null">#{isupload},
+ </if>
+ <if test="uploadTime != null">#{uploadTime},
+ </if>
+ <if test="orgid != null">#{orgid},
+ </if>
+ <if test="pguid != null">#{pguid},
+ </if>
+ <if test="guid != null">#{guid},
+ </if>
+ <if test="pid != null">#{pid},
+ </if>
</trim>
</insert>
<update id="updatePatMedOperationItem" parameterType="com.smartor.domain.PatMedOperationItem">
update pat_med_operation_item
<trim prefix="SET" suffixOverrides=",">
- <if test="opid != null">opid =
- #{opid},
- </if>
- <if test="opcode != null">opcode =
- #{opcode},
- </if>
- <if test="opdesc != null">opdesc =
- #{opdesc},
- </if>
- <if test="mainFlag != null">main_flag =
- #{mainFlag},
- </if>
- <if test="incitypecode != null">incitypecode =
- #{incitypecode},
- </if>
- <if test="incitypedesc != null">incitypedesc =
- #{incitypedesc},
- </if>
- <if test="oplevelcode != null">oplevelcode =
- #{oplevelcode},
- </if>
- <if test="opleveldesc != null">opleveldesc =
- #{opleveldesc},
- </if>
- <if test="opposition != null">opposition =
- #{opposition},
- </if>
- <if test="delFlag != null">del_flag =
- #{delFlag},
- </if>
- <if test="updateBy != null">update_by =
- #{updateBy},
- </if>
- <if test="updateTime != null">update_time =
- #{updateTime},
- </if>
- <if test="createBy != null">create_by =
- #{createBy},
- </if>
- <if test="createTime != null">create_time =
- #{createTime},
- </if>
- <if test="isupload != null">isupload =
- #{isupload},
- </if>
- <if test="uploadTime != null">upload_time =
- #{uploadTime},
- </if>
- <if test="orgid != null">orgid =
- #{orgid},
- </if>
- <if test="pguid != null">pguid =
- #{pguid},
- </if>
- <if test="guid != null">guid =
- #{guid},
- </if>
- <if test="pid != null">pid =
- #{pid},
- </if>
+ <if test="operationid != null">operationid =
+ #{operationid},
+ </if>
+ <if test="opid != null">opid =
+ #{opid},
+ </if>
+ <if test="opcode != null">opcode =
+ #{opcode},
+ </if>
+ <if test="opdesc != null">opdesc =
+ #{opdesc},
+ </if>
+ <if test="mainFlag != null">main_flag =
+ #{mainFlag},
+ </if>
+ <if test="incitypecode != null">incitypecode =
+ #{incitypecode},
+ </if>
+ <if test="incitypedesc != null">incitypedesc =
+ #{incitypedesc},
+ </if>
+ <if test="oplevelcode != null">oplevelcode =
+ #{oplevelcode},
+ </if>
+ <if test="opleveldesc != null">opleveldesc =
+ #{opleveldesc},
+ </if>
+ <if test="opposition != null">opposition =
+ #{opposition},
+ </if>
+ <if test="delFlag != null">del_flag =
+ #{delFlag},
+ </if>
+ <if test="updateBy != null">update_by =
+ #{updateBy},
+ </if>
+ <if test="updateTime != null">update_time =
+ #{updateTime},
+ </if>
+ <if test="createBy != null">create_by =
+ #{createBy},
+ </if>
+ <if test="createTime != null">create_time =
+ #{createTime},
+ </if>
+ <if test="isupload != null">isupload =
+ #{isupload},
+ </if>
+ <if test="uploadTime != null">upload_time =
+ #{uploadTime},
+ </if>
+ <if test="orgid != null">orgid =
+ #{orgid},
+ </if>
+ <if test="pguid != null">pguid =
+ #{pguid},
+ </if>
+ <if test="guid != null">guid =
+ #{guid},
+ </if>
+ <if test="pid != null">pid =
+ #{pid},
+ </if>
</trim>
where id = #{id}
</update>
- <update id="deletePatMedOperationItemById" parameterType="Long">
+ <update id="deletePatMedOperationItemById" parameterType="Long">
update pat_med_operation_item
<trim prefix="SET" suffixOverrides=",">
del_flag =1
</trim>
- where id = #{id}
+ where id = #{id}
</update>
- <update id="deletePatMedOperationItemByIds" parameterType="String">
- update pat_med_operation_item
+ <update id="deletePatMedOperationItemByIds" parameterType="String">
+ update pat_med_operation_item
<trim prefix="SET" suffixOverrides=",">
del_flag =1
</trim>
@@ -291,4 +281,6 @@
</update>
+
+
</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
index 880a5cc..e673eac 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
@@ -12,8 +12,8 @@
<result property="opreqid" column="opreqid"/>
<result property="opreqcode" column="opreqcode"/>
<result property="opsstatus" column="opsstatus"/>
- <result property="operationcode" column="operationcode"/>
- <result property="operationname" column="operationname"/>
+ <result property="optypecode" column="optypecode"/>
+ <result property="optypename" column="optypename"/>
<result property="operatortime" column="operatortime"/>
<result property="opreqtime" column="opreqtime"/>
<result property="reqdoccode" column="reqdoccode"/>
@@ -69,6 +69,13 @@
<result property="drname" column="drname"/>
<result property="nurseId" column="nurse_id"/>
<result property="nurseName" column="nurse_name"/>
+ <result property="checkFlag" column="check_flag"/>
+ <result property="longTaskReason" column="long_task_reason"/>
+ <result property="opid" column="opid"/>
+ <result property="opcode" column="opcode"/>
+ <result property="opdesc" column="opdesc"/>
+ <result property="oplevelcode" column="oplevelcode"/>
+ <result property="opleveldesc" column="opleveldesc"/>
</resultMap>
<sql id="selectPatMedOperationVo">
@@ -79,8 +86,8 @@
opreqid,
opreqcode,
opsstatus,
- operationcode,
- operationname,
+ optypecode,
+ optypename,
operatortime,
opreqtime,
reqdoccode,
@@ -135,7 +142,14 @@
drcode,
drname,
nurse_id,
- nurse_name
+ nurse_name,
+ check_flag,
+ long_task_reason,
+ opid,
+ opcode,
+ opdesc,
+ oplevelcode,
+ opleveldesc
from pat_med_operation
</sql>
@@ -143,6 +157,7 @@
resultMap="PatMedOperationResult">
<include refid="selectPatMedOperationVo"/>
<where>
+ del_flag='0'
<if test="patid != null ">
and patid = #{patid}
</if>
@@ -161,13 +176,12 @@
<if test="opsstatus != null and opsstatus != ''">
and opsstatus = #{opsstatus}
</if>
- <if test="operationcode != null and operationcode != ''">
- and operationcode = #{operationcode}
+ <if test="optypecode != null and optypecode != ''">
+ and optypecode = #{optypecode}
</if>
- <if test="operationname != null and operationname != ''">
- and operationname like concat('%', #{operationname}, '%')
+ <if test="optypename != null and optypename != ''">
+ and optypename like concat('%', #{optypename}, '%')
</if>
-
<if test="operatortime != null ">
and operatortime = #{operatortime}
</if>
@@ -315,6 +329,27 @@
<if test="nurseName != null and nurseName != ''">
and nurse_name like concat('%', #{nurseName}, '%')
</if>
+ <if test="checkFlag != null and checkFlag != ''">
+ and check_flag = #{checkFlag}
+ </if>
+ <if test="longTaskReason != null and longTaskReason != ''">
+ and long_task_reason = #{longTaskReason}
+ </if>
+ <if test="opid != null and opid != ''">
+ and opid = #{opid}
+ </if>
+ <if test="opcode != null and opcode != ''">
+ and opcode = #{opcode}
+ </if>
+ <if test="opdesc != null and opdesc != ''">
+ and opdesc = #{opdesc}
+ </if>
+ <if test="oplevelcode != null and oplevelcode != ''">
+ and oplevelcode = #{oplevelcode}
+ </if>
+ <if test="opleveldesc != null and opleveldesc != ''">
+ and opleveldesc = #{opleveldesc}
+ </if>
</where>
</select>
@@ -324,8 +359,7 @@
where id = #{id}
</select>
- <insert id="insertPatMedOperation" parameterType="com.smartor.domain.PatMedOperation" useGeneratedKeys="true"
- keyProperty="id">
+ <insert id="insertPatMedOperation" parameterType="com.smartor.domain.PatMedOperation">
insert into pat_med_operation
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,
@@ -342,9 +376,9 @@
</if>
<if test="opsstatus != null">opsstatus,
</if>
- <if test="operationcode != null">operationcode,
+ <if test="optypecode != null">optypecode,
</if>
- <if test="operationname != null">operationname,
+ <if test="optypename != null">optypename,
</if>
<if test="operatortime != null">operatortime,
</if>
@@ -456,6 +490,20 @@
</if>
<if test="nurseName != null">nurse_name,
</if>
+ <if test="checkFlag != null">check_flag,
+ </if>
+ <if test="longTaskReason != null">long_task_reason,
+ </if>
+ <if test="opid != null">opid,
+ </if>
+ <if test="opcode != null">opcode,
+ </if>
+ <if test="opdesc != null">opdesc,
+ </if>
+ <if test="oplevelcode != null">oplevelcode,
+ </if>
+ <if test="opleveldesc != null">opleveldesc,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},
@@ -472,9 +520,9 @@
</if>
<if test="opsstatus != null">#{opsstatus},
</if>
- <if test="operationcode != null">#{operationcode},
+ <if test="optypecode != null">#{optypecode},
</if>
- <if test="operationname != null">#{operationname},
+ <if test="optypename != null">#{optypename},
</if>
<if test="operatortime != null">#{operatortime},
</if>
@@ -586,6 +634,20 @@
</if>
<if test="nurseName != null">#{nurseName},
</if>
+ <if test="checkFlag != null">#{checkFlag},
+ </if>
+ <if test="longTaskReason != null">#{longTaskReason},
+ </if>
+ <if test="opid != null">#{opid},
+ </if>
+ <if test="opcode != null">#{opcode},
+ </if>
+ <if test="opdesc != null">#{opdesc},
+ </if>
+ <if test="oplevelcode != null">#{oplevelcode},
+ </if>
+ <if test="opleveldesc != null">#{opleveldesc},
+ </if>
</trim>
</insert>
@@ -610,11 +672,11 @@
<if test="opsstatus != null">opsstatus =
#{opsstatus},
</if>
- <if test="operationcode != null">operationcode =
- #{operationcode},
+ <if test="optypecode != null">optypecode =
+ #{optypecode},
</if>
- <if test="operationname != null">operationname =
- #{operationname},
+ <if test="optypename != null">optypename =
+ #{optypename},
</if>
<if test="operatortime != null">operatortime =
#{operatortime},
@@ -781,6 +843,27 @@
<if test="nurseName != null">nurse_name =
#{nurseName},
</if>
+ <if test="checkFlag != null">check_flag =
+ #{checkFlag},
+ </if>
+ <if test="longTaskReason != null">long_task_reason =
+ #{longTaskReason},
+ </if>
+ <if test="opid != null">opid =
+ #{opid},
+ </if>
+ <if test="opcode != null">opcode =
+ #{opcode},
+ </if>
+ <if test="opdesc != null">opdesc =
+ #{opdesc},
+ </if>
+ <if test="oplevelcode != null">oplevelcode =
+ #{oplevelcode},
+ </if>
+ <if test="opleveldesc != null">opleveldesc =
+ #{opleveldesc},
+ </if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
index 89bcb96..b1ea588 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
@@ -10,9 +10,9 @@
<result property="longtask" column="longtask"/>
<result property="taskName" column="task_name"/>
<result property="serviceType" column="service_type"/>
- <result property="deptId" column="dept_id"/>
- <result property="deptCode" column="dept_code"/>
- <result property="deptName" column="dept_name"/>
+ <result property="opid" column="opid"/>
+ <result property="opcode" column="opcode"/>
+ <result property="opdesc" column="opdesc"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
@@ -23,7 +23,7 @@
</resultMap>
<sql id="selectServiceTaskoperVo">
- select id, task_id, longtask, task_name, service_type, dept_id, dept_code, dept_name, del_flag, create_time, update_time, orgid, guid, pguid, pid
+ select id, task_id, longtask, task_name, service_type, opid, opcode, opdesc, del_flag, create_time, update_time, orgid, guid, pguid, pid
from service_taskoper
</sql>
@@ -43,14 +43,14 @@
<if test="serviceType != null and serviceType != ''">
and service_type = #{serviceType}
</if>
- <if test="deptId != null ">
- and dept_id = #{deptId}
+ <if test="opid != null ">
+ and opid = #{opid}
</if>
- <if test="deptCode != null and deptCode != ''">
- and dept_code = #{deptCode}
+ <if test="opcode != null and opcode != ''">
+ and opcode = #{opcode}
</if>
- <if test="deptName != null and deptName != ''">
- and dept_name like concat('%', #{deptName}, '%')
+ <if test="opdesc != null and opdesc != ''">
+ and opdesc = #{opdesc}
</if>
<if test="orgid != null and orgid != ''">
and orgid = #{orgid}
@@ -84,11 +84,11 @@
</if>
<if test="serviceType != null">service_type,
</if>
- <if test="deptId != null">dept_id,
+ <if test="opid != null">opid,
</if>
- <if test="deptCode != null">dept_code,
+ <if test="opcode != null">opcode,
</if>
- <if test="deptName != null">dept_name,
+ <if test="opdesc != null">opdesc,
</if>
<if test="delFlag != null">del_flag,
</if>
@@ -114,11 +114,11 @@
</if>
<if test="serviceType != null">#{serviceType},
</if>
- <if test="deptId != null">#{deptId},
+ <if test="opid != null">#{opid},
</if>
- <if test="deptCode != null">#{deptCode},
+ <if test="opcode != null">#{opcode},
</if>
- <if test="deptName != null">#{deptName},
+ <if test="opdesc != null">#{opdesc},
</if>
<if test="delFlag != null">#{delFlag},
</if>
@@ -152,14 +152,14 @@
<if test="serviceType != null">service_type =
#{serviceType},
</if>
- <if test="deptId != null">dept_id =
- #{deptId},
+ <if test="opid != null">opid =
+ #{opid},
</if>
- <if test="deptCode != null">dept_code =
- #{deptCode},
+ <if test="opcode != null">opcode =
+ #{opcode},
</if>
- <if test="deptName != null">dept_name =
- #{deptName},
+ <if test="opdesc != null">opdesc =
+ #{opdesc},
</if>
<if test="delFlag != null">del_flag =
#{delFlag},
--
Gitblit v1.9.3