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-03 16:21:32 +08:00
parent 8775d6fe01
commit a073c1815c
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,6 +204,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
} }
PatientTaskDto patientTaskDto = new PatientTaskDto(); PatientTaskDto patientTaskDto = new PatientTaskDto();
patientTaskDto.setPatientId(patientId); patientTaskDto.setPatientId(patientId);
//暂时不用
List<SignPatientManageRouteNode> nodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto); List<SignPatientManageRouteNode> nodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto);
List<String> nodeContentList = nodeList.stream().filter(Objects::nonNull).map(SignPatientManageRouteNode::getNodeContent).filter(Objects::nonNull).collect(Collectors.toList()); List<String> nodeContentList = nodeList.stream().filter(Objects::nonNull).map(SignPatientManageRouteNode::getNodeContent).filter(Objects::nonNull).collect(Collectors.toList());
String nodeContentListJoin = String.join(",", nodeContentList); String nodeContentListJoin = String.join(",", nodeContentList);
@ -233,20 +234,26 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
for (int i = 0; i < declaredFields.length; i++) { for (int i = 0; i < declaredFields.length; i++) {
strings[i] = declaredFields[i].getName().toUpperCase(); strings[i] = declaredFields[i].getName().toUpperCase();
} }
List<PortraitSnVO> PortraitSnVOS = new ArrayList<>();
List<String> asListStrings = Arrays.asList(strings); List<String> asListStrings = Arrays.asList(strings);
for (GroupingValue groupingValue : labelFieldContentList) { for (GroupingValue groupingValue : labelFieldContentList) {
PortraitSnVO portraitSnVO = new PortraitSnVO();
groupingValue.setPatientId(patientId); groupingValue.setPatientId(patientId);
String s = asListStrings.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).findFirst().orElse(new String()); String s = asListStrings.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).findFirst().orElse(new String());
groupingValue.setFieldValue(paramsValue.getOrDefault(s, "").toString()); groupingValue.setFieldValue(paramsValue.getOrDefault(s, "").toString());
portraitSnVO.setPortraitSn(groupingValue.getPortraitSn());
PortraitSnVOS.add(portraitSnVO);
} }
List<Long> collect = labelFieldContentList.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getTaskPartitionDictId())).map(LabelFieldInfo::getTaskPartitionDictId).distinct().collect(Collectors.toList());
List<LabelFieldAndPartitionDict> labelFieldAndPartitionDictList = new ArrayList<>(); List<LabelFieldAndPartitionDict> labelFieldAndPartitionDictList = new ArrayList<>();
LabelFieldAndPartitionDict labelFieldAndPartitionDict = new LabelFieldAndPartitionDict(); for (Long aLong : collect) {
labelFieldAndPartitionDict.setPortraitSnVOList(PortraitSnVOS); List<PortraitSnVO> PortraitSnVOS = new ArrayList<>();
labelFieldAndPartitionDictList.add(labelFieldAndPartitionDict); LabelFieldAndPartitionDict labelFieldAndPartitionDict = new LabelFieldAndPartitionDict();
PortraitSnVO portraitSnVO = new PortraitSnVO();
List<GroupingValue> collect1 = labelFieldContentList.stream().filter(Objects::nonNull).filter(item -> aLong.equals(item.getTaskPartitionDictId())).collect(Collectors.toList());
portraitSnVO.setGroupingValues(collect1);
PortraitSnVOS.add(portraitSnVO);
labelFieldAndPartitionDict.setTaskPartitionDictId(aLong);
labelFieldAndPartitionDict.setTaskPartitionDictName(collect1.get(0).getTaskPartitionDictName());
labelFieldAndPartitionDict.setPortraitSnVOList(PortraitSnVOS);
labelFieldAndPartitionDictList.add(labelFieldAndPartitionDict);
}
return labelFieldAndPartitionDictList; return labelFieldAndPartitionDictList;
} }

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

@ -232,17 +232,19 @@
<select id="selectLabelFieldInfoByTaskPartitionDictId" <select id="selectLabelFieldInfoByTaskPartitionDictId"
resultType="com.xinelu.manage.vo.labelfieldcontent.GroupingValue"> resultType="com.xinelu.manage.vo.labelfieldcontent.GroupingValue">
select id labelFieldInfoId, select lfi.id labelFieldInfoId,
field_name, lfi.field_name,
field_code, lfi.field_code,
field_type, lfi.field_type,
field_sort, lfi.field_sort,
field_remark, lfi.field_remark,
task_partition_dict_id, lfi.task_partition_dict_id,
task_partition_dict_name, lfi.task_partition_dict_name,
task_type_id, lfi.task_type_id,
task_type_name lfi.task_type_name
from label_field_info from label_field_info lfi
LEFT JOIN task_partition_dict tpd on tpd.id = lfi.task_partition_dict_id
LEFT JOIN task_type_dict ttd on ttd.id = tpd.task_type_id
<where> <where>
<if test="taskPartitionDictId != null and taskPartitionDictId != 0"> <if test="taskPartitionDictId != null and taskPartitionDictId != 0">
and task_partition_dict_id = #{taskPartitionDictId} and task_partition_dict_id = #{taskPartitionDictId}
@ -251,6 +253,7 @@
and task_partition_dict_id is null and task_partition_dict_id is null
</if> </if>
</where> </where>
Order by ttd.task_type_sort,tpd.task_partition_sort
</select> </select>
<select id="selectLabelFieldNameByTaskPartitionDictIds" <select id="selectLabelFieldNameByTaskPartitionDictIds"