Merge branch 'master' into gdb

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

@@ -20,8 +20,8 @@ public class IndicationDTO {
     private List<BillMsg> billMsgList = new ArrayList<>();
     // 高危药品、手术
     private List<BillMsg> highRiskList = new ArrayList<>();
-    // 特殊指标提醒
-    private List<BillMsg> specialList = new ArrayList<>();
+    // 其他提醒
+    private List<BillMsg> otherList = new ArrayList<>();
     // 记录调试信息
     private Map<String, Object> debug = new LinkedHashMap<>();
 }

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

@@ -16,7 +16,7 @@ import java.util.List;
 @Setter
 public class IndicationPushVO extends SearchData {
     /**
-     * 规则类型（1:危急值提醒，2:开单合理项，3:高危药品、手术，4:特殊指标提醒）
+     * 规则类型（1:危急值提醒，2:开单合理项，3:高危药品、手术，4:其他提醒）
      */
     @NotBlank(message = "ruleType不能为空")
     private String ruleType = "";

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

@@ -35,7 +35,7 @@ public class CoreController {
     @Autowired
     private PushFacade pushFacade;
 
-    @ApiOperation(value = "开单合理性API[zhoutg]", notes = "ruleType（1:危急值提醒，2:开单合理项，3:高危药品、手术，4:特殊指标提醒）")
+    @ApiOperation(value = "开单合理性API[zhoutg]", notes = "ruleType（1:危急值提醒，2:开单合理项，3:高危药品、手术，4:其他提醒）")
     @PostMapping("/indication")
     public RespDTO<IndicationDTO> indication(@Valid @RequestBody IndicationPushVO indicationPushVO) {
         IndicationDTO indicationDTO = indicationFacade.indicationFac(indicationPushVO);