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 3e195585..20980ed7 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
@@ -204,6 +204,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
         }
         PatientTaskDto patientTaskDto = new PatientTaskDto();
         patientTaskDto.setPatientId(patientId);
+        //暂时不用
         List<SignPatientManageRouteNode> nodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto);
         List<String> nodeContentList = nodeList.stream().filter(Objects::nonNull).map(SignPatientManageRouteNode::getNodeContent).filter(Objects::nonNull).collect(Collectors.toList());
         String nodeContentListJoin = String.join(",", nodeContentList);
@@ -233,20 +234,26 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
         for (int i = 0; i < declaredFields.length; i++) {
             strings[i] = declaredFields[i].getName().toUpperCase();
         }
-        List<PortraitSnVO> PortraitSnVOS = new ArrayList<>();
         List<String> asListStrings = Arrays.asList(strings);
         for (GroupingValue groupingValue : labelFieldContentList) {
-            PortraitSnVO portraitSnVO = new PortraitSnVO();
             groupingValue.setPatientId(patientId);
             String s = asListStrings.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).findFirst().orElse(new String());
             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<>();
-        LabelFieldAndPartitionDict labelFieldAndPartitionDict = new LabelFieldAndPartitionDict();
-        labelFieldAndPartitionDict.setPortraitSnVOList(PortraitSnVOS);
-        labelFieldAndPartitionDictList.add(labelFieldAndPartitionDict);
+        for (Long aLong : collect) {
+            List<PortraitSnVO> PortraitSnVOS = new ArrayList<>();
+            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;
     }
 
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 d3877b1e..d6a5ede6 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
@@ -232,17 +232,19 @@
 
     <select id="selectLabelFieldInfoByTaskPartitionDictId"
             resultType="com.xinelu.manage.vo.labelfieldcontent.GroupingValue">
-        select id labelFieldInfoId,
-        field_name,
-        field_code,
-        field_type,
-        field_sort,
-        field_remark,
-        task_partition_dict_id,
-        task_partition_dict_name,
-        task_type_id,
-        task_type_name
-        from label_field_info
+        select lfi.id labelFieldInfoId,
+        lfi.field_name,
+        lfi.field_code,
+        lfi.field_type,
+        lfi.field_sort,
+        lfi.field_remark,
+        lfi.task_partition_dict_id,
+        lfi.task_partition_dict_name,
+        lfi.task_type_id,
+        lfi.task_type_name
+        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>
             <if test="taskPartitionDictId != null and taskPartitionDictId != 0">
                 and task_partition_dict_id = #{taskPartitionDictId}
@@ -251,6 +253,7 @@
                 and task_partition_dict_id is null
             </if>
         </where>
+        Order by ttd.task_type_sort,tpd.task_partition_sort
     </select>
 
     <select id="selectLabelFieldNameByTaskPartitionDictIds"