Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/dto/PushDTO.java

@@ -33,7 +33,7 @@ public class PushDTO {
     //诊断
     private Map<String, List<PushBaseDTO>> dis;
     //一般治疗
-    private List<TreatDTO> generaTreat = new ArrayList<>();
+    private List<TreatDTO> treat = new ArrayList<>();
 
     // 记录调试信息
     private Map<String, Object> debug = new LinkedHashMap<>();

src/main/java/com/diagbot/dto/TreatDTO.java

@@ -14,9 +14,6 @@ import java.util.List;
 @Getter
 @Setter
 public class TreatDTO extends Item {
-
-    /**
-     * 明细
-     */
-    List<TreatDetailDTO> details;
+    //一般治疗
+    private String generaTreat;
 }

src/main/java/com/diagbot/process/PushProcess.java

@@ -193,7 +193,7 @@ public class PushProcess {
                     treatDTO.setUniqueName(x.getUniqueName());
                     return treatDTO;
                 }).collect(Collectors.toList());
-                pushDTO.setGeneraTreat(collect);
+                pushDTO.setTreat(collect);
             }
         }
 //            return pushDTO;