xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

画像及公共标签

Browse Source
This commit is contained in:
zhangheng 2024-07-15 16:10:26 +08:00
parent bf28fd557c
commit 504f036599
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java
View File

@ -294,8 +294,8 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
if (StringUtils.isBlank(portraitSnVO.getPortraitSn())) { if (StringUtils.isBlank(portraitSnVO.getPortraitSn())) {
portraitSnVO.setPortraitSn(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"))); portraitSnVO.setPortraitSn(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")));
portraitSnVO.getGroupingValues().forEach(item -> item.setPortraitSn(portraitSnVO.getPortraitSn())); portraitSnVO.getGroupingValues().forEach(item -> item.setPortraitSn(portraitSnVO.getPortraitSn()));
groupingValues.addAll(portraitSnVO.getGroupingValues());
} }
groupingValues.addAll(portraitSnVO.getGroupingValues());
TimeUnit.MILLISECONDS.sleep(10); TimeUnit.MILLISECONDS.sleep(10);
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {

2
postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java
View File

@ -75,7 +75,7 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService {
return new ArrayList<>(); return new ArrayList<>();
} }
int i = 1; int i = 1;
//查询细分 //根据细分id查询细分标签
List<LabelFieldVO> labelFieldList = labelFieldInfoMapper.selectLabelFieldList(taskPartitionDictId, fieldType); List<LabelFieldVO> labelFieldList = labelFieldInfoMapper.selectLabelFieldList(taskPartitionDictId, fieldType);
List<Long> taskPartitionDictIds = labelFieldList.stream().filter(Objects::nonNull).map(LabelFieldVO::getTaskPartitionDictId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); List<Long> taskPartitionDictIds = labelFieldList.stream().filter(Objects::nonNull).map(LabelFieldVO::getTaskPartitionDictId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
if (taskPartitionDictIds.size() == 0) { if (taskPartitionDictIds.size() == 0) {

7
postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
View File

@ -71,10 +71,13 @@
LEFT JOIN task_type_dict ttd ON ttd.id = tpd.task_type_id LEFT JOIN task_type_dict ttd ON ttd.id = tpd.task_type_id
<where> <where>
<if test="fieldType != null and fieldType != ''"> <if test="fieldType != null and fieldType != ''">
lfi.field_type = #{fieldType} and lfi.field_type = #{fieldType}
</if> </if>
<if test="taskPartitionDictId != null"> <if test="taskPartitionDictId != null">
tpd.id = #{taskPartitionDictId} and tpd.id = #{taskPartitionDictId}
</if>
<if test="taskPartitionDictId != null">
or tpd.apply_range = 'PUBLIC'
</if> </if>
</where> </where>
group by task_partition_dict_id group by task_partition_dict_id