Merge branch 'dev/20200702_1.3.7' into debug

doc/013.20200706v1.3.7/qc_initv1.3.7.sql

@@ -0,0 +1,3 @@
+use `qc`;
+
+ALTER TABLE `med_qcresult_info` ADD `have_home_page` tinyint(4) DEFAULT '0' COMMENT '是否有病案首页(0：无，1：有)' AFTER `score_res`;

src/main/java/com/diagbot/entity/QcresultInfo.java

@@ -62,6 +62,11 @@ public class QcresultInfo implements Serializable {
      */
     private BigDecimal scoreRes;
 
+    /**
+     * 是否有病案首页(0：无，1：有)
+     */
+    private Integer haveHomePage;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

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

@@ -293,6 +293,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     .eq("home_page_id", homePage.getHomePageId())
                     .orderByAsc("operation_order_no")
             );
+            analyzeVO.setHaveHomePage(1);
+        } else {
+            analyzeVO.setHaveHomePage(0);
         }
 
         // 拼接数据
@@ -588,7 +591,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @param map
      */
     public <T> void addDataWithKeyConvert(String key, List<T> list,
-                                      List<MedrecVo> medrecVoList, Map<String, String> map, List<String> dateList) {
+                                          List<MedrecVo> medrecVoList, Map<String, String> map, List<String> dateList) {
         MedrecVo medrecVo = new MedrecVo();
         medrecVo.setTitle(key);
         Map<String, Object> content = new HashMap<>();

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

@@ -169,6 +169,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
             qcresultInfo.setMenuData(menuData);
         }
 
+        qcresultInfo.setHaveHomePage(analyzeVO.getHaveHomePage());
         qcresultInfo.setGmtCreate(now);
         qcresultInfo.setCreator(useId.toString());
         qcresultInfo.setGmtModified(now);

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

@@ -21,4 +21,7 @@ public class AnalyzeVO {
     // 是否使用CRF缓存(false: 不使用缓存，true：使用缓存)
     @ApiModelProperty(hidden = true)
     private boolean useCrfCache;
+    //是否有病案首页(0：无，1：有)
+    @ApiModelProperty(hidden = true)
+    private Integer haveHomePage;
 }

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -10,6 +10,7 @@
         <result column="level" property="level" />
         <result column="score_res" property="scoreRes" />
         <result column="grade_type" property="gradeType" />
+        <result column="have_home_page" property="haveHomePage" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />
         <result column="gmt_modified" property="gmtModified" />