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

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

@@ -617,6 +617,7 @@ public class ArticleApi {
		vo.setIsAuthentication(isAuthentication);
		vo.setRoleType(roleType);
//		JSONArray array = new JSONArray();
		System.out.printf("OrgArticleVo参数："+vo.toString());
		try {
			JSONObject rv = ApiUtil.getRespJSON(10000, "成功");
			com.common.json.JSONObject result = dao.queryArticlePcList(vo, page, pageSize,userCode);

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

@@ -69,7 +69,7 @@ public class ArticleApiTest {
//		obj.put("articleTitle","1");
//		obj.put("userCode","0de7295862dd11e69faffa163e8aee56");
		obj.put("currentUserRole","3502110400");
		obj.put("currentUserRole","3502110100");
		obj.put("userCode","37959ddf86f211e6b394fa163e424525");//ylp201703150222
		obj.put("roleType",1);
@@ -83,7 +83,7 @@ public class ArticleApiTest {
		initDB();
		try{
//			api.authenticationArticle(im);
			System.out.println(api.queryArticlePcList(im));//initArticleStatistic
			System.out.println(api.queryArticleAPPList(im));//initArticleStatistic
//W			api.initArticleStatistic();
		}catch(Exception e){
			e.printStackTrace();

edu-article/JkEdu/src/com/yihu/jk/dao/ArticleDao.java

@@ -551,7 +551,7 @@ public class ArticleDao {
		StringBuffer param = new StringBuffer();
		StringBuffer param2 = new StringBuffer();
		StringBuffer pageParam = new StringBuffer();
		StringBuffer param3 = new StringBuffer();
//		if (StringUtil.isNotEmpty(vo.getOperatorRoleLevel())) {
//			param.append(" and OperatorRoleLevel < ? ");
//			sql.addParamValue(vo.getOperatorRoleLevel());
@@ -563,19 +563,19 @@ public class ArticleDao {
		if("1".equals(vo.getOperatorRoleLevel())){//省
//			param.append(" and OperatorRoleCode like '"+vo.getOperatorRoleCode().substring(0,3)+"%' ");
		}else if("2".equals(vo.getOperatorRoleLevel())){//市
			pageParam.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,2)+"0000' ) ");
			param3.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,2)+"0000 "):vo.getOperatorRoleCode())+"') ");
		}else if("3".equals(vo.getOperatorRoleLevel())){//区
			pageParam.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,2)+"0000' ) ");
			pageParam.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,4)+"00' ) ");
			param3.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,2)+"0000 "):vo.getOperatorRoleCode())+"') ");
			param3.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,4)+"00 "):vo.getOperatorRoleCode())+"') ");
		}else if("4".equals(vo.getOperatorRoleLevel())){//社区、机构
			pageParam.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,2)+"0000' ) ");
			pageParam.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,4)+"00' ) ");
			pageParam.append(" or (OperatorRoleLevel= 3 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,6)+"' ) ");
			param3.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,2)+"0000 "):vo.getOperatorRoleCode())+"') ");
			param3.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,4)+"00 "):vo.getOperatorRoleCode())+"') ");
			param3.append(" or (OperatorRoleLevel= 3 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,6)+" "):vo.getOperatorRoleCode())+"') ");
		}
		pageParam.append(" or (OperatorRoleLevel= "+vo.getOperatorRoleLevel()+" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ) ");
		param3.append(" or (OperatorRoleLevel= "+vo.getOperatorRoleLevel()+" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ) ");
		if(pageParam.toString().startsWith(" or")){
			param.append("and ("+pageParam.toString().substring(3)+")");
		if(param3.toString().startsWith(" or")){
			param.append("and ("+param3.toString().substring(3)+")");
		}
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			param.append(" and (UserScope <= ? ");
@@ -662,7 +662,7 @@ public class ArticleDao {
		StringBuffer param = new StringBuffer();
		StringBuffer param2 = new StringBuffer();
		StringBuffer pageParam = new StringBuffer();
		StringBuffer param3 = new StringBuffer();
//		if (StringUtil.isNotEmpty(vo.getOperatorRoleLevel())) {
//			param.append(" and OperatorRoleLevel < ? ");
//			sql.addParamValue(vo.getOperatorRoleLevel());
@@ -673,18 +673,18 @@ public class ArticleDao {
		if("1".equals(vo.getOperatorRoleLevel())){//省
//			param.append(" and OperatorRoleCode like '"+vo.getOperatorRoleCode().substring(0,3)+"%' ");
		}else if("2".equals(vo.getOperatorRoleLevel())){//市
			pageParam.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,2)+"0000' ) ");
			param3.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,2)+"0000 "):vo.getOperatorRoleCode())+"') ");
		}else if("3".equals(vo.getOperatorRoleLevel())){//区
			pageParam.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,2)+"0000' ) ");
			pageParam.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,4)+"00' ) ");
			param3.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,2)+"0000 "):vo.getOperatorRoleCode())+"') ");
			param3.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,4)+"00 "):vo.getOperatorRoleCode())+"') ");
		}else if("4".equals(vo.getOperatorRoleLevel())){//社区、机构
			pageParam.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,2)+"0000' ) ");
			pageParam.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,4)+"00' ) ");
			pageParam.append(" or (OperatorRoleLevel= 3 and OperatorRoleCode = '"+vo.getOperatorRoleCode().substring(0,6)+"' ) ");
			param3.append(" or (OperatorRoleLevel= 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,2)+"0000 "):vo.getOperatorRoleCode())+"') ");
			param3.append(" or (OperatorRoleLevel= 2 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,4)+"00 "):vo.getOperatorRoleCode())+"') ");
			param3.append(" or (OperatorRoleLevel= 3 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,6)+" "):vo.getOperatorRoleCode())+"') ");
		}
		pageParam.append(" or (OperatorRoleLevel= "+vo.getOperatorRoleLevel()+" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ) ");
		if(pageParam.toString().startsWith(" or")){
			param.append("and ("+pageParam.toString().substring(3)+")");
		param3.append(" or (OperatorRoleLevel= "+vo.getOperatorRoleLevel()+" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ) ");
		if(param3.toString().startsWith(" or")){
			param.append("and ("+param3.toString().substring(3)+")");
		}
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			param.append(" and (UserScope <= ? ");

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

@@ -311,4 +311,43 @@ public class OrgArticleVo {
	public void setRoleType(Integer roleType) {
		RoleType = roleType;
	}
	@Override
	public String toString() {
		return "OrgArticleVo{" +
				"ArticleId='" + ArticleId + '\'' +
				", ArticleTitle='" + ArticleTitle + '\'' +
				", ArticleContent='" + ArticleContent + '\'' +
				", ArticleOrder=" + ArticleOrder +
				", ArticleState=" + ArticleState +
				", OrgName='" + OrgName + '\'' +
				", ArticleSource='" + ArticleSource + '\'' +
				", OrgId='" + OrgId + '\'' +
				", Articlelevel=" + Articlelevel +
				", ArticleCover='" + ArticleCover + '\'' +
				", InsertTime=" + InsertTime +
				", UpdateTime=" + UpdateTime +
				", OperatorName='" + OperatorName + '\'' +
				", OperatorId='" + OperatorId + '\'' +
				", SecondLevelCategoryName='" + SecondLevelCategoryName + '\'' +
				", SecondLevelCategoryId='" + SecondLevelCategoryId + '\'' +
				", StartTime='" + StartTime + '\'' +
				", Authentication='" + Authentication + '\'' +
				", AuthenticationId='" + AuthenticationId + '\'' +
				", EndTime='" + EndTime + '\'' +
				", ArticleType='" + ArticleType + '\'' +
				", IsAuthentication=" + IsAuthentication +
				", FirstLevelCategoryName='" + FirstLevelCategoryName + '\'' +
				", FirstLevelCategoryId='" + FirstLevelCategoryId + '\'' +
				", DeptName='" + DeptName + '\'' +
				", TitleLevel='" + TitleLevel + '\'' +
				", OperatorImg='" + OperatorImg + '\'' +
				", LastOperatorId='" + LastOperatorId + '\'' +
				", LastOperatorName='" + LastOperatorName + '\'' +
				", OperatorRoleCode='" + OperatorRoleCode + '\'' +
				", OperatorRoleLevel='" + OperatorRoleLevel + '\'' +
				", UserScope=" + UserScope +
				", RoleType=" + RoleType +
				'}';
	}
}

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

@@ -6,10 +6,12 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.es.entity.HealthEduArticlePatient;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.profile.DoctorRole;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.organization.HospitalMapping;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorRoleDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.organization.HospitalMappingDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.BaseService;
@@ -68,6 +70,8 @@ public class ThirdJkEduArticleService extends BaseService {
    private HospitalMappingDao hospitalMappingDao;
    @Autowired
    private DoctorRoleDao doctorRoleDao;
    @Autowired
    private HospitalDao hospitalDao;
    
    //    private String baseUrl = "http://service.yihu.com:8085/WsPlatform/rest";
//    private String baseUrl = "http://172.17.110.230:83/WsPlatform/rest";
@@ -435,6 +439,10 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("firstLevelCategoryName", firstLevelCategoryName);
            param.put("content", content);
            param.put("newUrl", newUrl);
            Hospital hospital = hospitalDao.findByCode(operatorRoleCode);
            if(hospital!=null&&hospital.getLevel()==3){
                operatorRoleCode = hospital.getTown();
            }
            param.put("operatorRoleCode", operatorRoleCode);
            param.put("opertorRoleLevel", opertorRoleLevel);
            param.put("userScope", userScope);
@@ -501,6 +509,11 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("articleTitle", articleTitle);
            param.put("userCode", userCode);
            param.put("isAuthentication", isAuthentication);
            Hospital hospital = hospitalDao.findByCode(currentUserRole);
            if(hospital!=null&&hospital.getLevel()==3){
                currentUserRole = hospital.getTown();
            }
            param.put("currentUserRole", currentUserRole);
            param.put("currentUserRoleLevel", currentUserRoleLevel);
            param.put("page", page+"");
@@ -550,6 +563,11 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("articleTitle", articleTitle);
            param.put("userCode", userCode);
            param.put("isAuthentication", isAuthentication);
            Hospital hospital = hospitalDao.findByCode(currentUserRole);
            if(hospital!=null&&hospital.getLevel()==3){
                currentUserRole = hospital.getTown();
            }
            param.put("currentUserRole", currentUserRole);
            param.put("currentUserRoleLevel", currentUserRoleLevel);
            param.put("page", page+"");
@@ -597,6 +615,10 @@ public class ThirdJkEduArticleService extends BaseService {
            param.put("insertTimeEnd", insertTimeEnd);
            param.put("articleTitle", articleTitle);
            param.put("isAuthentication", isAuthentication);
            Hospital hospital = hospitalDao.findByCode(currentUserRole);
            if(hospital!=null&&hospital.getLevel()==3){
                currentUserRole = hospital.getTown();
            }
            param.put("currentUserRole", currentUserRole);
            param.put("currentUserRoleLevel", currentUserRoleLevel);
            param.put("page", page+"");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/BaseController.java

@@ -2,6 +2,8 @@ package com.yihu.wlyy.web;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.entity.IdEntity;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.util.DateUtil;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -32,6 +34,8 @@ public class BaseController {
    @Autowired
    protected HttpServletRequest request;
    @Autowired
    private HospitalDao hospitalDao;
    /**
     * 獲取髮送請求用戶的uid
@@ -191,7 +195,15 @@ public class BaseController {
                userAgent = request.getHeader("User-Agent");
            }
            JSONObject json = new JSONObject(userAgent);
            return json.getJSONObject("currentUserRole").getString("code");
            String currentUserRole = json.getJSONObject("currentUserRole").getString("code");
            if(StringUtils.isNotEmpty(currentUserRole)){
                Hospital hospital = hospitalDao.findByCode(currentUserRole);
                if(hospital.getLevel()==3){
                    return hospital.getTown();
                }
            }
            return currentUserRole;
        } catch (Exception e) {
            return null;
        }