PC端添加健教文章接口修改

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/user/UserService.java

@@ -196,8 +196,8 @@ public class UserService extends BaseJpaService<User,UserDao> {
            String[] codes = code.split(",");
            List<ManageDictEntry> manageDictEntries = manageDictEntryDao.findByDictIdAndCodes(dictId, codes);
            if (null != manageDictEntries && manageDictEntries.size() > 0) {
                return manageDictEntries.get(0).getValue();
//                return "http://localhost:8180/admin/main";
//                return manageDictEntries.get(0).getValue();
                return "http://localhost:8180/admin/main";
            }
        }
        return null;

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

@@ -5,8 +5,10 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.es.entity.HealthEduArticlePatient;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
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.organization.HospitalMappingDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.common.account.PatientService;
@@ -59,7 +61,9 @@ public class ThirdJkEduArticleService extends BaseService {
    private String articleBaseUrl;
    @Autowired
    private GcLabelService labelService;
    @Autowired
    private HospitalMappingDao hospitalMappingDao;
    
    //    private String baseUrl = "http://service.yihu.com:8085/WsPlatform/rest";
//    private String baseUrl = "http://172.17.110.230:83/WsPlatform/rest";
//    private String baseUrl = articleBaseUrl+"/WsPlatform/rest";
@@ -400,11 +404,14 @@ public class ThirdJkEduArticleService extends BaseService {
        JSONObject json = null;
        try {
            Doctor doctor = doctorDao.findByCode(userCode);
            String	orgName = doctor.getHospitalName();//组织名称
            
            HospitalMapping hospitalMapping = hospitalMappingDao.findByCode(operatorRoleCode);
            
            String	orgName = hospitalMapping.getName();//组织名称
            String	deptName = doctor.getDeptName();//科室名称
            String	levelName = doctor.getJobName();//职称
            String	photo = doctor.getPhoto();//头像
            String	orgId = doctor.getHospital();//组织
            String	orgId = operatorRoleCode;//组织
            String	userName = doctor.getName();//登录名称
            JSONObject param = new JSONObject();
            param.put("articleId", articleId);