Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/diagbot/model/ai/BeHospitalizedAI.java

src/main/java/com/diagbot/model/label/PacsLabel.java

@@ -1,7 +1,6 @@
 package com.diagbot.model.label;
 
 
-import com.diagbot.model.entity.Pacs;
 import com.diagbot.model.entity.PacsNew;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +17,6 @@ import java.util.List;
 @Setter
 @Getter
 public class PacsLabel extends GeneralLabel {
-     List<Pacs> pacses;
+//     List<Pacs> pacses;
     List<PacsNew> pacsNewList = new ArrayList<>(); // 辅检信息
 }