健教文章接口BUG修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEdu/DoctorJMJkEduArticleController.java

@@ -92,10 +92,10 @@ public class DoctorJMJkEduArticleController extends BaseController {
            @ApiParam(name = "currentRoleCode", value = "当前登录的角色code", required = false) @RequestParam(value = "currentRoleCode", required = false) String currentRoleCode,
            @ApiParam(name = "currentRoleLevel", value = "当前登录的角色级别", required = false) @RequestParam(value = "currentRoleLevel", required = false) String currentRoleLevel) {
        try {
            if(!StringUtils.isNotEmpty(currentRoleCode)){
            if(StringUtils.isEmpty(currentRoleCode)){
                currentRoleCode = getCurrentRoleCode();
            }
            if(!StringUtils.isNotEmpty(currentRoleLevel)){
            if(StringUtils.isEmpty(currentRoleLevel)){
                currentRoleLevel = getCurrentRoleLevel();
            }
            List<HealthEduArticlePatientModel> eduArticlePatients = jmJkEduArticleService.pushArticleList(page,pagesize,getUID(),firstLevelCategoryId,myArticle,sendType,currentRoleCode,currentRoleLevel);
@@ -129,10 +129,10 @@ public class DoctorJMJkEduArticleController extends BaseController {
            Set<String> patientSet = new HashSet<>(); //放入set中可以去重复
            //得到需要发送的患者
            if(!StringUtils.isNotEmpty(currentRoleCode)){
            if(StringUtils.isEmpty(currentRoleCode)){
                currentRoleCode = getCurrentRoleCode();
            }
            if(!StringUtils.isNotEmpty(currentRoleLevel)){
            if(StringUtils.isEmpty(currentRoleLevel)){
                currentRoleLevel = getCurrentRoleLevel();
            }
            jmJkEduArticleService.initPatient(patientSet,labelUnitType,labelSexType,labelServeType,labelDiseaseType,labelHealthType,getUID(),currentRoleCode,currentRoleLevel);
@@ -164,10 +164,10 @@ public class DoctorJMJkEduArticleController extends BaseController {
                                     @ApiParam(name = "currentRoleCode", value = "当前登录的角色code", required = false) @RequestParam(value = "currentRoleCode", required = false) String currentRoleCode,
                                     @ApiParam(name = "currentRoleLevel", value = "当前登录的角色级别", required = false) @RequestParam(value = "currentRoleLevel", required = false) String currentRoleLevel){
        try {
            if(!StringUtils.isNotEmpty(currentRoleCode)){
            if(StringUtils.isEmpty(currentRoleCode)){
                currentRoleCode = getCurrentRoleCode();
            }
            if(!StringUtils.isNotEmpty(currentRoleLevel)){
            if(StringUtils.isEmpty(currentRoleLevel)){
                currentRoleLevel = getCurrentRoleLevel();
            }
            com.alibaba.fastjson.JSONObject response = jmJkEduArticleService.pushArticleConfirm(articleId, labelUnitType,labelSexType,labelServeType,labelDiseaseType,labelHealthType,getUID(),currentRoleCode,currentRoleLevel);
@@ -292,10 +292,10 @@ public class DoctorJMJkEduArticleController extends BaseController {
            if (patientSet.size() == 0) {
                return new BaseResultModel("请至少选择一个患者！");
            }
            if(!StringUtils.isNotEmpty(currentUserRole)){
            if(StringUtils.isEmpty(currentUserRole)){
                currentUserRole = getCurrentRoleCode();
            }
            if(!StringUtils.isNotEmpty(currentUserRoleLevel)){
            if(StringUtils.isEmpty(currentUserRoleLevel)){
                currentUserRoleLevel = getCurrentRoleLevel();
            }
            HealthEduArticlePatient healthEduArticlePatient = jmJkEduArticleService.savePCPushArticle(patientSet, getUID(), 1,"", teamCode, articleId,leaveWords,currentUserRole,currentUserRoleLevel);
@@ -320,10 +320,10 @@ public class DoctorJMJkEduArticleController extends BaseController {
            @RequestParam(value = "currentUserRole", required = false) String currentUserRole,
            @RequestParam(value = "currentUserRoleLevel", required = false ,defaultValue = "4")String currentUserRoleLevel){
        try {
            if(!StringUtils.isNotEmpty(currentUserRole)){
            if(StringUtils.isEmpty(currentUserRole)){
                currentUserRole = getCurrentRoleCode();
            }
            if(!StringUtils.isNotEmpty(currentUserRoleLevel)){
            if(StringUtils.isEmpty(currentUserRoleLevel)){
                currentUserRoleLevel = getCurrentRoleLevel();
            }
            Set<String> patientSet = new HashSet<>(); //放入set中可以去重复

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -54,7 +54,7 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
                               @ApiParam(name = "userScope", value = "使用范围（1、全市使用，2、全区使用，3、全社区使用，4、自己使用）")
                               @RequestParam(value = "userScope", required = true) Integer userScope,
                               @ApiParam(name = "roleType", value = "1、普通医生，2、管理员")
                               @RequestParam(value = "roleType", required = false) Integer roleType){
                               @RequestParam(value = "roleType", required = true) Integer roleType){
        try {
            if(StringUtils.isEmpty(currentUserRole)){
@@ -104,10 +104,8 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
                                      @RequestParam(value = "isAuthentication", required = false) String isAuthentication,
                                      @ApiParam(name = "isMyArticle", value = "是否过滤我的文章")
                                      @RequestParam(value = "isMyArticle", required = false) Boolean isMyArticle,
                                      @ApiParam(name = "page", value = "当前页")
                                      @RequestParam(value = "page", required = true) Integer page,
                                      @ApiParam(name = "pageSize", value = "是否过滤我的文章")
                                      @RequestParam(value = "pageSize", required = true) Integer pageSize,
                                      @ApiParam(name = "iDisplayStart", value = "当前页") @RequestParam(value = "iDisplayStart", required = true) Integer page,
                                      @ApiParam(name = "iDisplayLength", value = "是否过滤我的文章") @RequestParam(value = "iDisplayLength", required = true) Integer pageSize,
                                      @ApiParam(name = "sEcho", value = "插件自带")
                                      @RequestParam(value = "sEcho", required = false) Integer sEcho,
                                      @ApiParam(name = "roleType", value = "1、普通医生，2、管理员")