From f44fc386a12e119df6ff0cd0b546bdb0d38d05db Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 27 七月 2026 13:42:48 +0800
Subject: [PATCH] 同德满意度异常,用钉钉提醒负责人

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

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 f349cfa..d211e97 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1738,19 +1738,19 @@
                         continue;
                     }
                     //2-AI璇嗗埆
-                    SysConfig configVoiceMatchType = new SysConfig();
-                    configVoiceMatchType.setOrgid(phoneCallReqYQVO.getOrgid());
-                    configVoiceMatchType.setConfigKey("sys.voice.match.type");
-                    SysConfig matchType = sysConfigMapper.selectConfig(configVoiceMatchType);
+//                    SysConfig configVoiceMatchType = new SysConfig();
+//                    configVoiceMatchType.setOrgid(phoneCallReqYQVO.getOrgid());
+//                    configVoiceMatchType.setConfigKey("sys.voice.match.type");
+//                    SysConfig matchType = sysConfigMapper.selectConfig(configVoiceMatchType);
                     boolean matchedFlag = false;
-                    if (ObjectUtils.isNotEmpty(matchType) && StringUtils.isNotEmpty(matchType.getConfigValue()) && matchType.getConfigValue().equals("2")) {
-                        int checkFlag = DeepSeekApi.matchQuestionAnswer(ivrTaskTemplateScriptVO.getScriptContent(),
-                                phoneCallReqYQVO.getAsrtext(),
-                                ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetvalue());
-                        if (checkFlag == 1) {
-                            matchedFlag = true;
-                        }
-                    } else {
+//                    if (ObjectUtils.isNotEmpty(matchType) && StringUtils.isNotEmpty(matchType.getConfigValue()) && matchType.getConfigValue().equals("2")) {
+//                        int checkFlag = DeepSeekApi.matchQuestionAnswer(ivrTaskTemplateScriptVO.getScriptContent(),
+//                                phoneCallReqYQVO.getAsrtext(),
+//                                ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetvalue());
+//                        if (checkFlag == 1) {
+//                            matchedFlag = true;
+//                        }
+//                    } else {
                         //鍖呭惈
                         Matcher matcher = null;
                         if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex())) {
@@ -1767,7 +1767,7 @@
                         if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() && StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches() || StringUtils.isEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex()) && StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2()) && matcher2.matches() || StringUtils.isEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex2()) && StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getTargetregex()) && matcher.matches()) {
                             matchedFlag = true;
                         }
-                    }
+//                    }
                     //璇存槑鍖归厤姝g‘浜�
                     if(matchedFlag){
                         //杩欓噷搴旇鍏堝垽鏂被鍨嬶紝鍘诲啀淇敼锛岃缃甀sUserOperation鏄崟閫夐鐨勬敼娉�
@@ -4869,7 +4869,7 @@
                 ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                 if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
                     serviceTaskdept.setDeptType("1");
-                    serviceTaskdept.setDeptCode(serviceTask.getDeptcode());
+                    serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
                 }
                 if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
                     serviceTaskdept.setDeptType("2");
@@ -4882,10 +4882,10 @@
 
                 if (!CollectionUtils.isEmpty(serviceTaskdepts)) {
                     PatArchive patArchive = new PatArchive();
-                    patArchive.setId(-1L);
+                    patArchive.setId(999999999L);
                     patArchive.setName("铏氭嫙鎮h��");
                     //灏佽serviceSubtask
-                    ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patArchive);
+                    ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, serviceTaskdepts.get(0), patArchive);
                     int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                     //鏍规嵁鐢熸垚澶栭摼
                     if (ObjectUtils.isNotEmpty(serviceSubtask.getTaskid()) && ObjectUtils.isNotEmpty(serviceSubtask.getPatid()) && ObjectUtils.isNotEmpty(serviceSubtask.getId())) {
@@ -4919,7 +4919,7 @@
         return content;
     }
 
-    public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatArchive patArchive) {
+    public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, ServiceTaskdept serviceTaskdept, PatArchive patArchive) {
         ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
         serviceSubtask.setTaskid(serviceTask.getTaskid());
         if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
@@ -4928,10 +4928,13 @@
 //        serviceSubtask.setNurseName(patMedInhosp1.getNurseName());
 //        serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
 //        serviceSubtask.setDrname(patMedInhosp1.getDrname());
-        serviceSubtask.setDeptcode(serviceTask.getDeptcode());
-        serviceSubtask.setDeptname(serviceTask.getDeptname());
-        serviceSubtask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
-        serviceSubtask.setLeavehospitaldistrictname(serviceTask.getLeavehospitaldistrictname());
+        if(StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("1")){
+            serviceSubtask.setDeptcode(serviceTaskdept.getDeptCode());
+            serviceSubtask.setDeptname(serviceTaskdept.getDeptName());
+        }else {
+            serviceSubtask.setLeavehospitaldistrictcode(serviceTaskdept.getDeptCode());
+            serviceSubtask.setLeavehospitaldistrictname(serviceTaskdept.getDeptName());
+        }
         serviceSubtask.setTemplateid(serviceTask.getTemplateid());
         serviceSubtask.setTemplatename(serviceTask.getTemplatename());
         serviceSubtask.setPatid(patArchive.getId());

--
Gitblit v1.9.3