Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

icssman-service/src/main/java/com/diagbot/facade/DisScaleFacade.java

@@ -31,9 +31,7 @@ import java.util.List;
 public class DisScaleFacade extends DisScaleServiceImpl{
     @Autowired
     private QuestionFacade questionFacade;
-    @Autowired
-    @Qualifier("disScaleServiceImpl")
-    private DisScaleService disScaleService;
+
     /**
      * 添加诊断量表关联信息
      *
@@ -77,7 +75,7 @@ public class DisScaleFacade extends DisScaleServiceImpl{
             disScale.setOrderNo(i + 1);
             addList.add(disScale);
         }
-        disScaleService.saveBatch(addList);
+        this.saveBatch(addList);
         return true;
     }
 

icssman-service/src/main/java/com/diagbot/web/DisScaleController.java

@@ -29,13 +29,14 @@ import javax.validation.Valid;
  */
 @RestController
 @RequestMapping("/disScale")
-@Api(value = "诊断关联量表相关API", tags = { "诊断关联量表相关API" })
+@Api(value = "诊断关联量表相关API", tags = { "2期-诊断关联量表相关API" })
+@SuppressWarnings("unchecked")
 public class DisScaleController {
 
     @Autowired
     private DisScaleFacade disScaleFacade;
 
-    @ApiOperation(value = "【二期】诊断量表关联——添加和修改[by:wangyu]",
+    @ApiOperation(value = "2期-诊断量表关联——添加和修改[by:wangyu]",
             notes = "disId: 诊断id,必填<br>" +
                     "scaleId: 量表id，必填<br>")
     @PostMapping("/addDisScaleInfo")