Merge branch 'develop' into dev/nurse20210421

# Conflicts:
#	src/main/java/com/diagbot/process/PushProcess.java
#	src/main/java/com/diagbot/web/CoreController.java

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

@@ -164,8 +164,10 @@ public class CacheFacade {
             // 推送版本
             Map<String, Object> versionMap = new LinkedMap<>();
             for (TranHospitalInfo hospitalInfo : hospitalList) {
-                if (StringUtil.isNotBlank(hospitalInfo.getRemark()) || "old".equals(hospitalInfo.getRemark())) {
+                if (StringUtil.isNotBlank(hospitalInfo.getRemark()) && "old".equals(hospitalInfo.getRemark())) {
                     versionMap.put(RedisEnum.hospitalId_.getName() + hospitalInfo.getId(), "old");
+                } else {
+                    versionMap.put(RedisEnum.hospitalId_.getName() + hospitalInfo.getId(), "new");
                 }
             }
             redisUtil.putHashMap(RedisEnum.pushVersion.getName(), versionMap);

src/main/java/com/diagbot/web/CoreController.java

@@ -42,10 +42,10 @@ public class CoreController {
         return RespDTO.onSuc(indicationDTO);
     }
 
-    @ApiOperation(value = "推送API[zhoutg]", notes = "" +
+    @ApiOperation(value = "推送API[zhoutg]", notes =
             "featureType 类型(多选必填)，1：症状，4：查体结果，5：检验，6：检查，" +
             "7：诊断，8：药品，9：手术，10：一般治疗, 12：量表，13：护理" +
-            "注意：11：管理评估，22：指标推送 这2个类型原5.0系统已占")
+            "<br>注意：11：管理评估，22：指标推送 这2个类型原5.0系统已占")
     @PostMapping("/push")
     public RespDTO<PushDTO> push(@RequestBody PushVO pushVo) {
         PushDTO pushDTO = pushFacade.pushFac(pushVo);