diff --git a/src/main/java/com/peanut/modules/common/entity/AiRecordFolder.java b/src/main/java/com/peanut/modules/common/entity/AiRecordFolder.java index 778e0b22..d879051e 100644 --- a/src/main/java/com/peanut/modules/common/entity/AiRecordFolder.java +++ b/src/main/java/com/peanut/modules/common/entity/AiRecordFolder.java @@ -27,6 +27,8 @@ public class AiRecordFolder implements Serializable { @TableLogic private Integer delFlag; + @TableField(exist = false) + private Integer here; } diff --git a/src/main/java/com/peanut/modules/common/entity/AiRecordFolderChat.java b/src/main/java/com/peanut/modules/common/entity/AiRecordFolderChat.java index 3ff55187..00cb2fba 100644 --- a/src/main/java/com/peanut/modules/common/entity/AiRecordFolderChat.java +++ b/src/main/java/com/peanut/modules/common/entity/AiRecordFolderChat.java @@ -14,7 +14,7 @@ public class AiRecordFolderChat implements Serializable { private Integer id; //病历夹id - private String folderId; + private Integer folderId; //患者姓名 private String patientName; @@ -32,6 +32,10 @@ public class AiRecordFolderChat implements Serializable { @TableField(exist = false) private String description; + @TableField(exist = false) + private String chatAssistantName; + @TableField(exist = false) + private String diagnosis; } diff --git a/src/main/java/com/peanut/modules/taihumed/controller/AiRecordFolderController.java b/src/main/java/com/peanut/modules/taihumed/controller/AiRecordFolderController.java index 516cf8be..c7a99c43 100644 --- a/src/main/java/com/peanut/modules/taihumed/controller/AiRecordFolderController.java +++ b/src/main/java/com/peanut/modules/taihumed/controller/AiRecordFolderController.java @@ -46,7 +46,10 @@ public class AiRecordFolderController { .eq(AiChatContent::getChatId,recordFolderChat.getChatId()) .orderByAsc(AiChatContent::getCreateTime)); if (chatContent.size()>0){ - recordFolderChat.setDescription(chatContent.get(0).getContent()); + String des = chatContent.get(0).getContent(); + recordFolderChat.setDescription(des); + recordFolderChat.setChatAssistantName(chatContent.get(0).getChatAssistantName()); + recordFolderChat.setDiagnosis(des.contains("诊断:")?des.substring(des.indexOf("诊断:")+3,des.indexOf(",病情为:")):des); } } return R.ok().put("list",list); @@ -56,15 +59,22 @@ public class AiRecordFolderController { @RequestMapping("/getRecordFolders") public R getRecordFolders(@RequestBody Map params){ MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.leftJoin(AiRecordFolderChat.class,AiRecordFolderChat::getFolderId,AiRecordFolder::getId); - wrapper.selectAll(AiRecordFolder.class); - wrapper.distinct(); wrapper.eq(AiRecordFolder::getUserId, ShiroUtils.getUId()); wrapper.like(StringUtils.isNotEmpty(params.get("folderName").toString()), AiRecordFolder::getFolderName,params.get("folderName")); - wrapper.like(StringUtils.isNotEmpty(params.get("patientName").toString()), AiRecordFolderChat::getPatientName,params.get("patientName")); wrapper.orderByAsc(AiRecordFolder::getSort); - wrapper.orderByDesc(AiRecordFolderChat::getCreateTime); + wrapper.orderByDesc(AiRecordFolder::getCreateTime); List list = aiRecordFolderService.list(wrapper); + for (AiRecordFolder aiRecordFolder:list){ + aiRecordFolder.setHere(0); + List chats = aiRecordFolderChatService.list(new LambdaQueryWrapper() + .eq(AiRecordFolderChat::getChatAssistantId,params.get("assistantId")) + .eq(AiRecordFolderChat::getChatId,params.get("chatId"))); + for (AiRecordFolderChat folderChat:chats){ + if (folderChat.getFolderId().equals(aiRecordFolder.getId())){ + aiRecordFolder.setHere(1); + } + } + } return R.ok().put("list",list); } @@ -82,6 +92,19 @@ public class AiRecordFolderController { return R.ok(); } + //修改病历夹患者名称 + @RequestMapping("/updateRecordFolderChat") + public R updateRecordFolderChat(@RequestBody Map params){ + List chats = aiRecordFolderChatService.list(new LambdaQueryWrapper() + .eq(AiRecordFolderChat::getChatAssistantId,params.get("chatAssistantId")) + .eq(AiRecordFolderChat::getChatId,params.get("chatId"))); + for (AiRecordFolderChat chat:chats){ + chat.setPatientName(params.get("patientName").toString()); + aiRecordFolderChatService.updateById(chat); + } + return R.ok(); + } + //修改病例夹 @RequestMapping("/updateRecordFolder") public R updateRecordFolder(@RequestBody AiRecordFolder aiRecordFolder){