指明后台管理系统二期新增和修改的接口

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

@@ -6,7 +6,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.util.RespDTOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +46,7 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 	@Autowired
 	UserServiceClient userServiceClient;
 	@Autowired
+	@Qualifier("evaluationModuleMappingServiceImpl")
 	EvaluationModuleMappingService evaluationModuleMappingService;
 
 	/**
@@ -61,7 +64,7 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 		Map<String, String> userNames = new HashMap<>();
 		if (modifierid.size() > 0) {
 			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
-			if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+			if (RespDTOUtil.respIsNG(userNamesDTO)) {
 				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
 			}
 			userNames = userNamesDTO.data;
@@ -132,7 +135,7 @@ public class EvaluationModuleMappingFacade extends EvaluationModuleMappingServic
 
 	/**
 	 * 
-	 * @param indexConfigListVO
+	 * @param evaluationModuleListVO
 	 * @return
 	 */
 	public boolean saveEvaluationModuleList(EvaluationModuleListVO evaluationModuleListVO) {

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

@@ -41,7 +41,7 @@ public class EvaluationModuleMappingController {
 	EvaluationModuleMappingFacade evaluationModuleMappingFacade;
 	
 	
-	@ApiOperation(value = "分页模糊查询标签组维护接口[by:wangfeng]", notes = "diseaseName : 疾病名")
+	@ApiOperation(value = "2期-分页模糊查询标签组维护接口[by:wangfeng]", notes = "diseaseName : 疾病名")
     @PostMapping("/queryEvaluationModulePages")
     @SysLogger("queryEvaluationModulePages")
     @Transactional
@@ -52,7 +52,7 @@ public class EvaluationModuleMappingController {
         return RespDTO.onSuc(data);
     }
 
-	@ApiOperation(value = "获取慢病标签组维护[by:wangfeng]", notes = "疾病ID ： diseaseId")
+	@ApiOperation(value = "2期-获取慢病标签组维护[by:wangfeng]", notes = "疾病ID ： diseaseId")
     @PostMapping("/getEvaluationModuleLists")
     @SysLogger("getEvaluationModuleLists")
     @Transactional
@@ -63,7 +63,7 @@ public class EvaluationModuleMappingController {
         return RespDTO.onSuc(data);
     }
 	
-	@ApiOperation(value = "慢病评估维护——修改管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
+	@ApiOperation(value = "2期-慢病评估维护——修改管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
 			+ "evaluationModuleData:{ 区域名 regionName;"
 			+ "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
 			+ "区域顺序 ：orderNo; "
@@ -78,7 +78,7 @@ public class EvaluationModuleMappingController {
 
         return RespDTO.onSuc(res);
     }
-	@ApiOperation(value = "慢病评估维护——添加管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
+	@ApiOperation(value = "2期-慢病评估维护——添加管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
 			+ "evaluationModuleData:{ 区域名 regionName;"
 			+ "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
 			+ "区域顺序 ：orderNo; "
@@ -94,7 +94,7 @@ public class EvaluationModuleMappingController {
         return RespDTO.onSuc(res);
     }
 	
-	@ApiOperation(value = "删除慢病标签组维护[by:wangfeng]", notes = "diseaseId ：疾病id")
+	@ApiOperation(value = "2期-删除慢病标签组维护[by:wangfeng]", notes = "diseaseId ：疾病id")
     @PostMapping("/cancelEvaluationModuleAlls")
     @SysLogger("cancelEvaluationModuleAlls")
     @Transactional

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

@@ -28,7 +28,8 @@ import javax.validation.Valid;
  */
 @RestController
 @RequestMapping("/lisMapping")
-@Api(value = "化验公表项映射维护相关API", tags = { "化验公表项映射维护相关API" })
+@SuppressWarnings("unchecked")
+@Api(value = "化验公表项映射维护相关API", tags = { "2期-化验公表项映射维护相关API" })
 public class LisMappingController {
     @Autowired
     private LisMappingFacade lisMappingFacade;
@@ -39,7 +40,7 @@ public class LisMappingController {
      * @param lisMappingPageVO
      * @return
      */
-    @ApiOperation(value = "分页查询提示信息，带条件[by:zhaops]",
+    @ApiOperation(value = "2期-分页查询提示信息，带条件[by:zhaops]",
             notes = "current:页码，必填<br>" +
                     "size:每页显示条数，必填<br>" +
                     "mealName:大项名称<br>" +
@@ -51,7 +52,7 @@ public class LisMappingController {
         return RespDTO.onSuc(lisMappingFacade.getLisMappingPage(lisMappingPageVO));
     }
 
-    @ApiOperation(value = "化验公表项映射新增[by:zhaops]",
+    @ApiOperation(value = "2期-化验公表项映射新增[by:zhaops]",
             notes = "mealName:大项名称，必填<br>" +
                     "itemName:小项名称<br>" +
                     "uniqueName:公表名称，必填<br>" +
@@ -62,7 +63,7 @@ public class LisMappingController {
         return RespDTO.onSuc(lisMappingFacade.addLisMapping(lisMappingVO));
     }
 
-    @ApiOperation(value = "化验公表项映射修改[by:zhaops]",
+    @ApiOperation(value = "2期-化验公表项映射修改[by:zhaops]",
             notes = "mealName:大项名称，必填<br>" +
                     "itemName:小项名称<br>" +
                     "uniqueName:公表名称，必填<br>")
@@ -72,7 +73,7 @@ public class LisMappingController {
         return RespDTO.onSuc(lisMappingFacade.modifyLisMapping(lisMappingVO));
     }
 
-    @ApiOperation(value = "删除单条化验公表项映射[by:zhaops]",
+    @ApiOperation(value = "2期-删除单条化验公表项映射[by:zhaops]",
             notes = "id:id，必填<br>")
     @PostMapping("/delLisMappingById")
     @SysLogger("delLisMappingById")
@@ -80,7 +81,7 @@ public class LisMappingController {
         return RespDTO.onSuc(lisMappingFacade.delLisMappingById(idVO));
     }
 
-    @ApiOperation(value = "批量删除化验公表项映射[by:zhaops]",
+    @ApiOperation(value = "2期-批量删除化验公表项映射[by:zhaops]",
             notes = "ids:ids，必填<br>")
     @PostMapping("/delLisMappingByIds")
     @SysLogger("delLisMappingByIds")

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

@@ -49,7 +49,7 @@ public class ModuleInfoController {
     @Autowired
     ModuleInfoFacade moduleInfoFacade;
 
-    @ApiOperation(value = "【二期】模板新增[by:wangyu]",
+    @ApiOperation(value = "2期-模板新增[by:wangyu]",
             notes = "name: 模板名称，必填<br>" +
                     "type: 模板类型，必填<br>" +
                     "questionId: 标签id，不是标点符号时需要填写<br>" +
@@ -67,7 +67,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "【二期】模板修改[by:wangyu]",
+    @ApiOperation(value = "2期-模板修改[by:wangyu]",
             notes = "id: 模板id，必填<br>" +
                     "name: 模板名称，必填<br>" +
                     "type: 模板类型，必填<br>" +
@@ -105,7 +105,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "【二期】获取模板信息(作为子模板使用时传入moduleType)[by:wangyu]",
+    @ApiOperation(value = "2期-获取模板信息(作为子模板使用时传入moduleType)[by:wangyu]",
             notes = "moduleType: 模板类型,0.通用 1.根据科室划分 2.慢病 3.子模板<br>" +
                     "<br>")
     @PostMapping("/getModuleInfo")
@@ -115,7 +115,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "【二期】获取模板列表（主页面查询）[by:wangyu]",
+    @ApiOperation(value = "2期-获取模板列表（主页面查询）[by:wangyu]",
             notes = "type: 模板类型,1.主诉 2.现病史 3.其他史 4.查体 5.化验 6.辅检 7.诊断 8.医嘱<br>" +
                     "<br>")
     @PostMapping("/getModuleInfoList")
@@ -125,7 +125,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "【二期】获取模板明细信息——修改时获取已添加过的标签[by:wangyu]",
+    @ApiOperation(value = "2期-获取模板明细信息——修改时获取已添加过的标签[by:wangyu]",
             notes = "moduleId: 模板id<br>" +
                     "<br>")
     @PostMapping("/getModuleDetailInfo")
@@ -135,7 +135,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "【二期】获取单个模板信息(修改用)[by:wangyu]",
+    @ApiOperation(value = "2期-获取单个模板信息(修改用)[by:wangyu]",
             notes = "" +
                     "moduleId: 模板id<br>")
     @PostMapping("/getModuleInfoOne")
@@ -145,7 +145,7 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
-    @ApiOperation(value = "【二期】获取模板Type[主诉到诊断][by:wangyu]",
+    @ApiOperation(value = "2期-获取模板Type[主诉到诊断][by:wangyu]",
             notes = "moduleType: 模板mouduleType，必填<br>" +
                     "")
     @PostMapping("/getModuleType")

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

@@ -93,7 +93,7 @@ public class QuestionInfoController {
     }
 
 
-    @ApiOperation(value = "标签删除[by:zhoutg]",
+    @ApiOperation(value = "2期-标签删除[by:zhoutg]",
             notes = "")
     @PostMapping("/delete")
     @SysLogger("delete")

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

@@ -72,7 +72,7 @@ public class QuestionUsualController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "常用标签维护——获取科室名称[by:wangyu]",
+    @ApiOperation(value = "2期-常用标签维护——获取科室名称[by:wangyu]",
             notes = "")
     @PostMapping("/getDeptName")
     @SysLogger("getDeptName")