Merge branch 'devRe' into innerDevelop

# Conflicts:
#	src/main/java/com/diagbot/vo/AnalyzeRunVO.java
#	src/main/java/com/diagbot/web/ADataStrController.java

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -302,6 +302,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 for (RecordContentDTO recordContentDTO : recordContentDTOList) {
                     recTitle = recordContentDTO.getRecTitle();
                     recordContentDTO.setXmlText(encrypDES.decryptor(recordContentDTO.getXmlText()));
+                    recordContentDTO.setHtmlText(encrypDES.decryptor(recordContentDTO.getHtmlText()));
                 }
             } catch (Exception e) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,

src/main/java/com/diagbot/vo/AnalyzeRunVO.java

@@ -22,6 +22,6 @@ public class AnalyzeRunVO {
     private Long modeId;
     // 归档字段
     private String isPlacefile = "0";
-    //默认分组
-    private Integer NeedGroup = 1;
+
+    private Integer NeedGroup = 0;
 }