From 6061b870b1bac0e2929d0c80448f2d3cfc518e3d Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 26 Jun 2024 18:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../LabelFieldContentMapper.java | 11 +-- .../labelfieldinfo/LabelFieldInfoMapper.java | 9 +++ .../impl/LabelFieldContentServiceImpl.java | 41 ++++++------ .../impl/LabelFieldInfoServiceImpl.java | 4 -- .../LabelFieldContentMapper.xml | 67 +++++++++---------- .../labelfieldinfo/LabelFieldInfoMapper.xml | 23 +++++++ 7 files changed, 92 insertions(+), 65 deletions(-) diff --git a/postdischarge-admin/src/main/resources/application-dev.yml b/postdischarge-admin/src/main/resources/application-dev.yml index fdee91ed..109a9b6b 100644 --- a/postdischarge-admin/src/main/resources/application-dev.yml +++ b/postdischarge-admin/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.16.64:3306/post-discharge?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.16.64:3306/post-discharge?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true username: root password: 1qaz!@#$ # 从库数据源 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java index f695a741..0c56784f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java @@ -4,9 +4,10 @@ import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldContentVO; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldInfoContentVo; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 标签字段内容信息Mapper接口 * @@ -81,7 +82,7 @@ public interface LabelFieldContentMapper { List selectLabelFieldContent(@Param("labelFieldIds") List labelFieldIds); /** - * 画像查询 + * 画像内容查询 * * @param taskPartitionDictId 细分id * @param patientId 患者id @@ -106,10 +107,10 @@ public interface LabelFieldContentMapper { int insertLabelFieldContentList(List labelFieldContentList); /** - * 批量修改 + * 批量修改 (dev.yml url &allowMultiQueries=true) * - * @param labelFieldContentList - * @return + * @param labelFieldContentList 标签内容 + * @return int */ int updateContentRemarkLabelFieldContentList(List labelFieldContentList); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java index 697df589..7084d540 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.labelfieldinfo; import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo; +import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; import com.xinelu.manage.vo.labelfieldinfo.LabelFieldVO; import org.apache.ibatis.annotations.Param; @@ -86,4 +87,12 @@ public interface LabelFieldInfoMapper { * @return LabelFieldInfo */ List taskPartitionDictIdList(String taskPartitionDictName); + + /** + * 查询标签 + * + * @param taskPartitionDictId 标签 + * @return GroupingValue + */ + List selectLabelFieldInfoByTaskPartitionDictId(Long taskPartitionDictId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index bc8bb359..b4020a41 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -197,7 +197,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { return new ArrayList<>(collect.values()); } //查询未维护标签及从患者表取值 - List labelFieldContentList = labelFieldContentMapper.groupingValue(taskPartitionDictId, null, null); + List labelFieldContentList = labelFieldInfoMapper.selectLabelFieldInfoByTaskPartitionDictId(taskPartitionDictId); JSONObject paramsValue = getParamsValue(patientId); if (CollectionUtils.isEmpty(labelFieldContentList)) { return new ArrayList<>(); @@ -211,6 +211,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { } List strings1 = Arrays.asList(strings); for (GroupingValue groupingValue : labelFieldContentList) { + groupingValue.setPatientId(patientId); String s = strings1.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).findFirst().orElse(new String()); groupingValue.setFieldValue(paramsValue.getOrDefault(s, "").toString()); } @@ -219,25 +220,6 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { return lists; } - /** - * 根据任务细分类型获取患者的真实信息 - * - * @param patientId 患者主键 - * @return 实际信息 - */ - private JSONObject getParamsValue(Long patientId) { - JSONObject retObj; - List patientAllInfoViews = patientAllInfoViewMapper.selectPatientAllInfoListViewByPatientId(patientId); - if (CollectionUtils.isEmpty(patientAllInfoViews) || ObjectUtils.isEmpty(patientAllInfoViews.get(0))) { - throw new ServiceException("患者信息获取错误，请联系管理员!"); - } - PatientAllInfoViewUppercase patientAllInfoView = patientAllInfoViews.get(0); - retObj = JSONObject.parseObject(JSONObject.toJSONString(patientAllInfoView)); - // 性别转换成中文、计算年龄 - retObj.fluentPut("SEX", PatientSexEnum.getInfoByCode(patientAllInfoView.getSEX()).getInfo()).fluentPut("AGE", BaseUtil.getAge(patientAllInfoView.getBIRTHDATE())); - return retObj; - } - /** * 画像内容新增 * @@ -298,4 +280,23 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { } return AjaxResult.success(); } + + /** + * 根据任务细分类型获取患者的真实信息 + * + * @param patientId 患者主键 + * @return 实际信息 + */ + private JSONObject getParamsValue(Long patientId) { + JSONObject retObj; + List patientAllInfoViews = patientAllInfoViewMapper.selectPatientAllInfoListViewByPatientId(patientId); + if (CollectionUtils.isEmpty(patientAllInfoViews) || ObjectUtils.isEmpty(patientAllInfoViews.get(0))) { + throw new ServiceException("患者信息获取错误，请联系管理员!"); + } + PatientAllInfoViewUppercase patientAllInfoView = patientAllInfoViews.get(0); + retObj = JSONObject.parseObject(JSONObject.toJSONString(patientAllInfoView)); + // 性别转换成中文、计算年龄 + retObj.fluentPut("SEX", PatientSexEnum.getInfoByCode(patientAllInfoView.getSEX()).getInfo()).fluentPut("AGE", BaseUtil.getAge(patientAllInfoView.getBIRTHDATE())); + return retObj; + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java index 08340746..de44da28 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java @@ -104,10 +104,6 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { if (ObjectUtils.isEmpty(fieldInfo)) { throw new ServiceException("当前标签信息不存在，无法修改，请联系管理员"); } - // 检查除当前记录外有没有重复的标签信息名称 - if (labelFieldInfoMapper.countByFieldNameExcludingId(labelFieldInfo.getId(), labelFieldInfo.getFieldType(), labelFieldInfo.getFieldName()) > 0) { - throw new ServiceException("当前字段类型下字段名称已存在"); - } // 执行修改操作 labelFieldInfo.setUpdateBy(SecurityUtils.getUsername()); labelFieldInfo.setUpdateTime(LocalDateTime.now()); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml index 355aa859..a71610b8 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml @@ -246,6 +246,7 @@ lfi.task_type_name, lfc.id labelFieldContentId, lfc.field_id, + lfc.patient_id, lfc.field_name, lfc.field_code, lfc.field_value, @@ -313,42 +314,38 @@ - + update label_field_content - field_id = - #{item.fieldId}, - - field_name = - #{item.fieldName}, - - field_code = - #{item.fieldCode}, - - field_value = - #{item.fieldValue}, - - portrait_sn = - #{item.portraitSn}, - - patient_id = - #{item.patientId}, - - portrait_status = - #{item.portraitStatus}, - - content_sort = - #{item.contentSort}, - - content_remark = - #{item.contentRemark}, - - update_by = - #{item.updateBy}, - - update_time = - #{item.updateTime}, - - where id = #{item.labelFieldContentId} + + field_id = + #{labelFieldContentList.fieldId}, + + field_name = + #{labelFieldContentList.fieldName}, + + field_code = + #{labelFieldContentList.fieldCode}, + + field_value = + #{labelFieldContentList.fieldValue}, + + portrait_sn = + #{labelFieldContentList.portraitSn}, + + patient_id = + #{labelFieldContentList.patientId}, + + portrait_status = + #{labelFieldContentList.portraitStatus}, + + update_by = + #{labelFieldContentList.updateBy}, + + update_time = + #{labelFieldContentList.updateTime}, + + + where id = #{labelFieldContentList.labelFieldContentId} \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml index d21e337a..5aa431be 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml @@ -225,4 +225,27 @@ + + \ No newline at end of file