From 620f2e358bd945cf336f6cf7dd2429290dd34b76 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 12 六月 2026 17:28:25 +0800
Subject: [PATCH] 【市一】手术随访 多选手术等级 配置科室
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 1
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 57 ++++++-------
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java | 1
smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java | 74 ++++++++++++------
smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml | 50 ++++++++++++
5 files changed, 126 insertions(+), 57 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index 771d890..12ca6d4 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -433,7 +433,6 @@
@ApiModelProperty("鎵嬫湳绛夌骇缂栫爜")
@Excel(name = "鎵嬫湳绛夌骇缂栫爜")
private String oplevelcode;
-
/**
* 閫傜敤鏉′欢绫诲瀷锛�1銆佹寜绉戝銆�2銆佹寜鐥呭尯銆�3銆佹寜鐤剧梾璇婃柇銆�4銆佹寜鎵嬫湳绫诲瀷
*/
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
index 3722acd..41a23ac 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskoper.java
@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* 浠诲姟鎵嬫湳鍏宠仈瀵硅薄 service_taskoper
*
@@ -18,24 +20,23 @@
private static final long serialVersionUID = 1L;
/**
- * 妯℃澘搴撳拰绉戝鍏宠仈id
+ * 涓婚敭ID
*/
- @ApiModelProperty("妯℃澘搴撳拰绉戝鍏宠仈id")
- //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @ApiModelProperty("涓婚敭ID")
private Long id;
/**
- * 浠诲姟id
+ * 浠诲姟ID
*/
- @ApiModelProperty("浠诲姟id")
- @Excel(name = "浠诲姟id")
+ @ApiModelProperty("浠诲姟ID")
+ @Excel(name = "浠诲姟ID")
private Long taskId;
/**
- * 鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸
+ * 鏄惁闀挎湡妯℃澘锛�0 鍚︼紝1 鏄�
*/
- @ApiModelProperty("鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸")
- @Excel(name = "鏄惁鏄暱鏈熸ā鏉匡細 0锛氫笉鏄� 1锛氭槸")
+ @ApiModelProperty("鏄惁闀挎湡妯℃澘锛�0 鍚︼紝1 鏄�")
+ @Excel(name = "鏄惁闀挎湡妯℃澘锛�0 鍚︼紝1 鏄�")
private Long longtask;
/**
@@ -46,17 +47,17 @@
private String taskName;
/**
- * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁�
+ * 鏈嶅姟绫诲瀷
*/
- @ApiModelProperty("鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁�")
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁�)")
+ @ApiModelProperty("鏈嶅姟绫诲瀷")
+ @Excel(name = "鏈嶅姟绫诲瀷")
private String serviceType;
/**
- * 鎵嬫湳id
+ * 鎵嬫湳ID
*/
- @ApiModelProperty("鎵嬫湳id")
- @Excel(name = "鎵嬫湳id")
+ @ApiModelProperty("鎵嬫湳ID")
+ @Excel(name = "鎵嬫湳ID")
private String opid;
/**
@@ -67,12 +68,11 @@
private String opcode;
/**
- * 鎵嬫湳缂栫爜
+ * 鎵嬫湳绛夌骇浠ｇ爜
*/
@ApiModelProperty("鎵嬫湳绛夌骇浠ｇ爜")
@Excel(name = "鎵嬫湳绛夌骇浠ｇ爜")
private String oplevelcode;
-
/**
* 鎵嬫湳鍚嶇О
@@ -82,9 +82,37 @@
private String opdesc;
/**
- * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+ * 绉戝缂栫爜
*/
- @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ @ApiModelProperty("绉戝缂栫爜")
+ @Excel(name = "绉戝缂栫爜")
+ private String deptCode;
+
+ /**
+ * 绉戝鍚嶇О
+ */
+ @ApiModelProperty("绉戝鍚嶇О")
+ @Excel(name = "绉戝鍚嶇О")
+ private String deptName;
+
+ /**
+ * 鐥呭尯缂栫爜
+ */
+ @ApiModelProperty("鐥呭尯缂栫爜")
+ @Excel(name = "鐥呭尯缂栫爜")
+ private String wardCode;
+
+ /**
+ * 鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty("鐥呭尯鍚嶇О")
+ @Excel(name = "鐥呭尯鍚嶇О")
+ private String wardName;
+
+ /**
+ * 鍒犻櫎鏍囧織锛�0 鏈垹闄わ紝1 宸插垹闄�
+ */
+ @ApiModelProperty("鍒犻櫎鏍囧織锛�0 鏈垹闄わ紝1 宸插垹闄�")
private Integer delFlag;
/**
@@ -95,10 +123,10 @@
private String orgid;
/**
- * $column.columnComment
+ * GUID
*/
- @ApiModelProperty("$column.columnComment")
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @ApiModelProperty("GUID")
+ @Excel(name = "GUID")
private String guid;
/**
@@ -114,6 +142,4 @@
@ApiModelProperty("鐖禝D")
@Excel(name = "鐖禝D")
private Long pid;
-
}
-
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 27e21f1..d7ddca4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -313,6 +313,7 @@
addSubTaskByRule(config);
//鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
if (!active.equals("xh")) {
+ //todo 鎵嬫湳涓昏〃-鎵嬫湳璇︽儏琛�-鍑洪櫌璁板綍琛�-绉戝鍏崇郴锛� 闇�瑕侀檺鍒剁瀹わ紵
addOperationSubTask(config);
}
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 aefb351..867f34d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -983,43 +983,38 @@
// }
// serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
- serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
+// serviceTaskoper.setOplevelcode(serviceTaskVO.getOplevelcode());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(Long.valueOf(serviceTask.getLongTask()));
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
- serviceTaskoper.setCreateTime(new Date());
-// if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
-// String[] opcodes = serviceTaskVO.getOpcode().split(",");
-// for (String opcode : opcodes) {
-// //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
-// ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
-// serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
-// serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
-// List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
-//
-// serviceTaskoper.setOpcode(opcode);
-// log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
-// if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
-// serviceTaskoper.setId(serviceTaskopers.get(0).getId());
-// serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
-// } else {
-// serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
-// }
-// }
-// }
- ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
- serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
- serviceTaskoper2.setOrgid(serviceTask.getOrgid());
-// serviceTaskoper2.setOplevelcode(serviceTaskVO.getOplevelcode());
- List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
- if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
- serviceTaskoper.setId(serviceTaskopers.get(0).getId());
- serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
- } else {
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ serviceTaskoper.setDeptCode(serviceTask1.getDeptcode());
+ serviceTaskoper.setDeptName(serviceTask1.getDeptname());
+ serviceTaskoper.setWardCode(serviceTask1.getLeavehospitaldistrictcode());
+ serviceTaskoper.setWardName(serviceTask1.getLeavehospitaldistrictname());
+
+ serviceTaskoper.setCreateTime(new Date());
+ if (StringUtils.isNotEmpty(serviceTaskVO.getOplevelcode())) {
+ String[] opLevelcodes = serviceTaskVO.getOplevelcode().split(",");
+ for (String opLevelcode : opLevelcodes) {
+ //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+ log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+ ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
+ serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
+ serviceTaskoper2.setOrgid(serviceTask.getOrgid());
+ serviceTaskoper2.setOplevelcode(opLevelcode);
+ List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
+
+ serviceTaskoper.setOplevelcode(opLevelcode);
+ if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
+ serviceTaskoper.setId(serviceTaskopers.get(0).getId());
+ serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
+ } else {
+ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ }
+ }
}
}
}
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
index eff4e36..0fd21c8 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
@@ -21,6 +21,10 @@
<result property="guid" column="guid"/>
<result property="pguid" column="pguid"/>
<result property="pid" column="pid"/>
+ <result property="deptCode" column="dept_code"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="wardCode" column="ward_code"/>
+ <result property="wardName" column="ward_name"/>
</resultMap>
<sql id="selectServiceTaskoperVo">
@@ -39,7 +43,11 @@
orgid,
guid,
pguid,
- pid
+ pid,
+ dept_code,
+ dept_name,
+ ward_code,
+ ward_name
from service_taskoper
</sql>
@@ -84,6 +92,18 @@
<if test="pid != null ">
and pid = #{pid}
</if>
+ <if test="deptCode != null and deptCode != ''">
+ and dept_code = #{deptCode}
+ </if>
+ <if test="deptName != null and deptName != ''">
+ and dept_name = #{deptName}
+ </if>
+ <if test="wardCode != null and wardCode != ''">
+ and ward_code = #{wardCode}
+ </if>
+ <if test="wardName != null and wardName != ''">
+ and ward_name = #{wardName}
+ </if>
</select>
<select id="selectServiceTaskoperById" parameterType="Long"
@@ -126,6 +146,14 @@
</if>
<if test="pid != null">pid,
</if>
+ <if test="deptCode != null">dept_code,
+ </if>
+ <if test="deptName != null">dept_name,
+ </if>
+ <if test="wardCode != null">ward_code,
+ </if>
+ <if test="wardName != null">ward_name,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskId != null">#{taskId},
@@ -157,6 +185,14 @@
<if test="pguid != null">#{pguid},
</if>
<if test="pid != null">#{pid},
+ </if>
+ <if test="deptCode != null">#{deptCode},
+ </if>
+ <if test="deptName != null">#{deptName},
+ </if>
+ <if test="wardCode != null">#{wardCode},
+ </if>
+ <if test="wardName != null">#{wardName},
</if>
</trim>
</insert>
@@ -209,6 +245,18 @@
<if test="pid != null">pid =
#{pid},
</if>
+ <if test="deptCode != null">dept_code =
+ #{deptCode},
+ </if>
+ <if test="deptName != null">dept_name =
+ #{deptName},
+ </if>
+ <if test="wardCode != null">ward_code =
+ #{wardCode},
+ </if>
+ <if test="wardName != null">ward_name =
+ #{wardName},
+ </if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3