From a9ca20807149ac4c68ccfc4efb5036d1b17ec6d9 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 2 Aug 2024 10:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialDiseaseNodeController.java | 2 +- .../SpecialDiseaseNode.java | 13 ++++++++--- .../SignPatientManageRouteServiceImpl.java | 4 ++-- ...SignPatientManageRouteNodeServiceImpl.java | 4 ++-- .../impl/SpecialDiseaseRouteServiceImpl.java | 4 ++-- .../SpecialDiseaseNodeMapper.xml | 22 ++++++++++++++++--- 6 files changed, 36 insertions(+), 13 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java index 66d27266..1ed1d5d4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java @@ -82,7 +82,7 @@ public class SpecialDiseaseNodeController extends BaseController { } /** - * 修改专病路径-管理节点信息 + * 修改专病路径-管理节点信息(专病路径新增修改) */ @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:edit')") @Log(title = "专病路径-管理节点信息", businessType = BusinessType.UPDATE) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java index f4f104dd..2fff0547 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java @@ -246,11 +246,18 @@ public class SpecialDiseaseNode extends BaseEntity { private String phoneDialMethod; /** - * AI电话模板表id + * 话术表 ID */ - @ApiModelProperty(value = "AI电话模板表id") + @ApiModelProperty(value = "话术表 ID") + @Excel(name = "话术表 ID") + private Long scriptInfoId; + + /** + * AI电话模板id + */ + @ApiModelProperty(value = "AI电话模板id") @Excel(name = "AI电话模板表id") - private Long phoneTemplateId; + private String phoneTemplateId; /** * AI电话模板名称 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index 42964604..c9748b6e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -679,9 +679,9 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout break; // 话术 case TaskNodeTypeConstants.PHONE_OUTBOUND: - manageRouteNode.setPhoneId(node.getPhoneTemplateId()); + manageRouteNode.setPhoneId(node.getScriptInfoId()); // 查询话术 - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneTemplateId()); + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { // 话术库json内容替换 manageRouteNode.setPhoneNodeContent(signPatientManageRouteNodeService.getFlowScheme(scriptInfo.getFlowScheme(), labelFieldContentList)); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index 0f0eede8..340fb879 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -1024,9 +1024,9 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage break; // 话术 case TaskNodeTypeConstants.PHONE_OUTBOUND: - manageRouteNode.setPhoneId(node.getTemplateId()); + manageRouteNode.setPhoneId(node.getScriptInfoId()); // 查询话术 - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneTemplateId()); + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { // 话术库json内容替换 manageRouteNode.setPhoneNodeContent(getFlowScheme(scriptInfo.getFlowScheme(), labelFieldContentList)); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java index 8ac3c5b7..857d0016 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java @@ -342,9 +342,9 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi break; // 话术 case TaskNodeTypeConstants.PHONE_OUTBOUND: - manageRouteNode.setPhoneId(node.getPhoneTemplateId()); + manageRouteNode.setPhoneId(node.getScriptInfoId()); // 查询话术 - ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneTemplateId()); + ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getScriptInfoId()); if (ObjectUtils.isNotEmpty(scriptInfo)) { // 话术库json内容替换 manageRouteNode.setPhoneNodeContent(scriptInfo.getFlowScheme()); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index b57ed244..a3b5400f 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -75,6 +75,7 @@ + @@ -128,6 +129,7 @@ + @@ -180,7 +182,8 @@ create_by, create_time, update_by, - update_time + update_time, + script_info_id from special_disease_node @@ -316,6 +319,9 @@ and node_content = #{nodeContent} + + and script_info_id = #{scriptInfoId} +