From 2eaff8a03fbce8da7bb399278b188687c566dba2 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Thu, 2 Nov 2023 14:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E6=96=AD=E6=B5=81=E7=A8=8B=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DiagnosisPhysicalRecordMapper.xml  | 19 ++++++++++---------
 .../supervision/controller/AskController.java |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml
index c25a2b49..c6e017a0 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml
@@ -25,17 +25,18 @@
     </sql>
     <select id="queryPhysicalResultByProcessId"
             resultType="com.supervision.vo.result.PhysicalRecordByResultDAO">
-        select concat_ws(t3.tool_name, t4.location_name, '|') as toolLocationName,
-               t1.id                                          as recordId,
-               t2.require_check                               as requireCheck,
-               t2.basis_confirm                               as basisConfirm,
-               t2.basis_identification                        as basisIdentification,
-               t3.id                                          as toolId,
-               t4.id                                          as locationId
+        select (IF(t4.location_name IS NULL, t3.tool_name,
+                   CONCAT_WS(' | ', t3.tool_name, t4.location_name))) AS toolLocationName,
+               t1.id                                                  as recordId,
+               t2.require_check                                       as requireCheck,
+               t2.basis_confirm                                       as basisConfirm,
+               t2.basis_identification                                as basisIdentification,
+               t3.id                                                  as toolId,
+               t4.id                                                  as locationId
         from vp_diagnosis_physical_record t1
                  left join vp_disease_physical t2 on t1.physical_id = t2.id
                  left join vp_config_physical_tool t3 on t2.tool_id = t3.id
-                 left join vp_config_physical_location t4 on t2.location_id = t3.id
+                 left join vp_config_physical_location t4 on t2.location_id = t4.id
         where t1.process_id = #{processId}
     </select>
 
@@ -50,7 +51,7 @@
                t1.create_time   as createTime
         from vp_diagnosis_physical_record t1
                  left join vp_config_physical_tool t3 on t1.tool_id = t3.id
-                 left join vp_config_physical_location t4 on t1.location_id = t3.id
+                 left join vp_config_physical_location t4 on t1.location_id = t4.id
         where t1.process_id = #{processId}
         order by t1.create_time desc
     </select>
diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java
index 7fd54c21..5642e77c 100644
--- a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java
+++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java
@@ -27,7 +27,7 @@ public class AskController {
     }
 
     @ApiOperation("接收页面的语音消息(这个接口使用京东数字人接口来做)")
-    @PostMapping("/receiveVoiceFile")
+    @PostMapping("/talk")
     public TalkResultResVO talk(TalkReqVO talkReqVO) throws IOException {
         return askService.talk(talkReqVO);
     }