Merge branch 'dev' of liuwenbin/patient-co-management into dev

edu-article/JkEdu/WebRoot/WEB-INF/classes/configDictionary.sql.xml

@@ -3,7 +3,7 @@
	<Sqls> 
		 <Sql name='loadAllConfigDictionary'>
		 <![CDATA[
				select * from Config_Dictionary where TypeName is not null order by TypeName,Code   
				select * from Config_Dictionary where TypeName is not null order by TypeName,Code
			]]>
		</Sql>
	

edu-article/JkEdu/src/com/yihu/jk/api/ConfigDicShoApiTest.java

@@ -28,6 +28,7 @@ public class ConfigDicShoApiTest {
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("typeName","prio");
		obj.put("code","1");
		im.setParam(obj.toString());
		initDB();
		System.out.println(api.getConfigDicShoList(im));

edu-article/JkEdu/src/com/yihu/jk/vo/ConfigDictionary.java

@@ -12,7 +12,7 @@ public class ConfigDictionary {
	private String OperatorId;
	private String DictionaryText;
	private String URL;
	
	
	public String getURL() {
		return URL;
@@ -68,6 +68,5 @@ public class ConfigDictionary {
	public void setDictionaryText(String dictionaryText) {
		DictionaryText = dictionaryText;
	}
	
	
}

edu-article/JkEdu/src/com/yihu/jk/vo/ConfigDictionaryShort.java

@@ -8,7 +8,7 @@ public class ConfigDictionaryShort {
	private String CodeName;
	private String TypeName;
	private String URL;
	
	
	public String getURL() {
		return URL;
@@ -34,7 +34,5 @@ public class ConfigDictionaryShort {
	public void setCodeName(String codeName) {
		CodeName = codeName;
	}
	
	
	
}

edu-article/JkEdu/src/configDictionary.sql.xml

@@ -3,7 +3,7 @@
	<Sqls> 
		 <Sql name='loadAllConfigDictionary'>
		 <![CDATA[
				select * from Config_Dictionary where TypeName is not null order by TypeName,Code   
				select * from Config_Dictionary where TypeName is not null order by TypeName,Code
			]]>
		</Sql>
	

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -884,7 +884,7 @@ public class JMJkEduArticleService extends BaseService {
     */
    public void saveArticle(String userCode,String articleTitle,String articleType,Integer	articlelevel,String	secondLevelCategoryId,String image,
                            String	secondLevelCategoryName,String firstLevelCategoryId,String firstLevelCategoryName,String content,String operatorRoleCode,
                            String opertorRoleLevel,Integer userScope,String articleId) throws Exception {
                            String opertorRoleLevel,Integer userScope,String articleId,Integer roleType) throws Exception {
        if(!StringUtils.isEmpty(image)){
@@ -901,7 +901,7 @@ public class JMJkEduArticleService extends BaseService {
        }
        thirdJkEduArticleService.saveArticle(userCode,articleTitle,articleType,articlelevel,secondLevelCategoryId,image,
                secondLevelCategoryName,firstLevelCategoryId,firstLevelCategoryName,content,operatorRoleCode,opertorRoleLevel,
                userScope,isAuthentication,articleId);
                userScope,isAuthentication,articleId,roleType);
    }
    /**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jkEduArticle/ThirdJkEduArticleService.java

@@ -378,7 +378,7 @@ public class ThirdJkEduArticleService extends BaseService {
     */
    public void saveArticle(String userCode,String articleTitle,String articleType,Integer	articlelevel,String	secondLevelCategoryId,String newUrl,
                                 String	secondLevelCategoryName,String firstLevelCategoryId,String firstLevelCategoryName,String content,
                                 String operatorRoleCode,String opertorRoleLevel,Integer userScope,Integer isAuthentication,String articleId) throws Exception {
                                 String operatorRoleCode,String opertorRoleLevel,Integer userScope,Integer isAuthentication,String articleId,Integer roleType) throws Exception {
        String response = "";
        JSONObject json = null;
@@ -411,6 +411,7 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("operatorRoleCode", operatorRoleCode);
            param.put("opertorRoleLevel", opertorRoleLevel);
            param.put("userScope", userScope);
            param.put("roleType", roleType);
            param.put("isAuthentication", isAuthentication);
            if(isAuthentication==1){
                param.put("authentication", doctor.getHospital());

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

@@ -48,11 +48,13 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
                               @ApiParam(name = "imageUrl", value = "文章封面图片地址")
                               @RequestParam(value = "imageUrl", required = false) String imageUrl,
                               @ApiParam(name = "currentUserRole", value = "当前登录的角色")
                               @RequestParam(value = "currentUserRole", required = true) String currentUserRole,
                               @RequestParam(value = "currentUserRole", required = false) String currentUserRole,
                               @ApiParam(name = "currentUserRoleLevel", value = "当前登录的角色级别")
                               @RequestParam(value = "currentUserRoleLevel", required = false )String currentUserRoleLevel,
                               @ApiParam(name = "userScope", value = "使用范围（1、全市使用，2、全区使用，3、全社区使用，4、自己使用）")
                               @RequestParam(value = "userScope", required = true) Integer userScope){
                               @RequestParam(value = "userScope", required = true) Integer userScope,
                               @ApiParam(name = "roleType", value = "1、普通医生，2、管理员")
                               @RequestParam(value = "roleType", required = false) Integer roleType){
        try {
            if(StringUtils.isNotEmpty(currentUserRole)){
@@ -62,7 +64,7 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
                currentUserRoleLevel=getCurrentRoleLevel();
            }
            jmJkEduArticleService.saveArticle(getUID(),articleTitle,articleType,articlelevel,secondLevelCategoryId,imageUrl,
                    secondLevelCategoryName,firstLevelCategoryId,firstLevelCategoryName,content,currentUserRole,currentUserRoleLevel,userScope,articleId);
                    secondLevelCategoryName,firstLevelCategoryId,firstLevelCategoryName,content,currentUserRole,currentUserRoleLevel,userScope,articleId,roleType);
            return success("添加成功！");
        }catch (Exception e){
            e.printStackTrace();