manage：1. 修复问题

virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java

@@ -1,5 +1,6 @@
 package com.supervision.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.MD5;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -48,7 +50,7 @@ public class ConfigAncillaryItemServiceImpl extends ServiceImpl<ConfigAncillaryI
         }
 
         return configAncillaryItems.stream().map(e->{
-            ConfigAncillaryItemVo itemVo = new ConfigAncillaryItemVo(e);
+            ConfigAncillaryItemVo itemVo = BeanUtil.toBean(e,ConfigAncillaryItemVo.class);
             itemVo.setExecStatus(recordItemIds.contains(itemVo.getId()) ? 1 : 0 );
             return itemVo;
         }).collect(Collectors.toList());
@@ -59,13 +61,22 @@ public class ConfigAncillaryItemServiceImpl extends ServiceImpl<ConfigAncillaryI
     public List<ConfigAncillaryItemResVO> queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) {
 
         List<ConfigAncillaryItemVo> list = this.queryVoList(ancillaryItemReqVo);
-        return list.stream().collect(Collectors.groupingBy(ConfigAncillaryItem::getType)).entrySet().stream().map(e -> {
-            ConfigAncillaryItemResVO item = new ConfigAncillaryItemResVO();
-            item.setItemName(e.getKey());
-            item.setId(new MD5().digestHex16(e.getKey()));
-            item.setItemList(e.getValue());
-            return item;
-        }).collect(Collectors.toList());
+        return list.stream().collect(Collectors.groupingBy(ConfigAncillaryItem::getType)).entrySet().stream().
+                map(ConfigAncillaryItemServiceImpl::getConfigAncillaryItemResVO).collect(Collectors.toList());
+    }
+
+    private static ConfigAncillaryItemResVO getConfigAncillaryItemResVO(Map.Entry<String, List<ConfigAncillaryItemVo>> e) {
+        ConfigAncillaryItemResVO item = new ConfigAncillaryItemResVO();
+        item.setItemName(e.getKey());
+        item.setId(new MD5().digestHex16(e.getKey()));
+        item.setItemIdPath(CollUtil.newArrayList(item.getId()));
+        item.setItemList(e.getValue());
+        if (CollUtil.isNotEmpty(item.getItemList())){
+            for (ConfigAncillaryItemVo itemVo : item.getItemList()) {
+                itemVo.setItemIdPath(CollUtil.newArrayList(item.getId(),itemVo.getId()));
+            }
+        }
+        return item;
     }
 
     private List<ConfigAncillaryItem> findByKeyWord(String keyWord){

virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java

@@ -21,4 +21,7 @@ public class ConfigAncillaryItemResVO {
     private boolean flag;
 
     private List<ConfigAncillaryItemVo> itemList;
+
+    @ApiModelProperty("检查项id路径")
+    private List<String> itemIdPath;
 }

virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java

@@ -1,5 +1,6 @@
 package com.supervision.vo.manage;
 
+import cn.hutool.crypto.digest.MD5;
 import com.supervision.model.DiseaseAncillary;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -56,8 +57,7 @@ public class DiseaseAncillaryResVo extends DiseaseAncillary {
         if (null == itemIdPath){
             itemIdPath = new ArrayList<>();
         }
-
-        itemIdPath.add(itemType);
+        itemIdPath.add(new MD5().digestHex16(itemType));
         itemIdPath.add(getItemId());
     }
 

virtual-patient-model/src/main/java/com/supervision/vo/result/ConfigAncillaryItemVo.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ConfigAncillaryItemVo extends ConfigAncillaryItem {
@@ -15,26 +17,7 @@ public class ConfigAncillaryItemVo extends ConfigAncillaryItem {
     @ApiModelProperty("标识 true:已选择 false:未选择")
     private boolean flag;
 
-    public ConfigAncillaryItemVo() {
-    }
-
-    public ConfigAncillaryItemVo(Integer execStatus) {
-        this.execStatus = execStatus;
-    }
-
-
+    @ApiModelProperty("检查项id路径")
+    private List<String> itemIdPath;
 
-    public ConfigAncillaryItemVo(ConfigAncillaryItem configAncillaryItem){
-        super.setId(configAncillaryItem.getId());
-        super.setType(configAncillaryItem.getType());
-        super.setCode(configAncillaryItem.getCode());
-        super.setItemClass(configAncillaryItem.getItemClass());
-        super.setItemName(configAncillaryItem.getItemName());
-        super.setInfo(configAncillaryItem.getInfo());
-        super.setCallOutQuestion(configAncillaryItem.getCallOutQuestion());
-        super.setCreateTime(configAncillaryItem.getCreateTime());
-        super.setCreateUserId(configAncillaryItem.getCreateUserId());
-        super.setUpdateTime(configAncillaryItem.getUpdateTime());
-        super.setUpdateUserId(configAncillaryItem.getUpdateUserId());
-    }
 }