活动抽奖；健康教育

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/jkedu/repository/JkeduStatisticsArticleDao.java

@@ -14,7 +14,6 @@ public interface JkeduStatisticsArticleDao
		extends PagingAndSortingRepository<NewArticleStatisticsModel, Long>, JpaSpecificationExecutor<NewArticleStatisticsModel> {
	@Modifying
	@Transactional
	@Query("update NewArticleStatisticsModel s set s.shareNumber=?2,s.collectionNumber=?3," +
			"s.pushNumber=?4,s.browseNumber=?5 where s.articleId=?1")
	int modifyStatics(String articleId, int shareNumber,int collectionNumber,int pushNumber,int browseNumber);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireService.java

@@ -426,10 +426,18 @@ public class QuestionnaireService extends BaseService {
		QuestionnaireWinningESDO result = new QuestionnaireWinningESDO();
		if (resultList!=null && resultList.size()>0){
			result = resultList.get(0);
			String prizeCode = RivaEDCode.passDecode(key1,key2,result.getPrizeCode());
			String prizePsw = RivaEDCode.passDecode(key1,key2,result.getPrizePsw());
			result.setPrizeCode(prizeCode);
			result.setPrizePsw(prizePsw);
			System.out.println("1-------"+result.getPrizeCode());
			System.out.println("2-------"+result.getPrizePsw());
			System.out.println("3-------"+key1);
			System.out.println("4-------"+key2);
			if (!StringUtils.isEmpty(result.getPrizeCode())){
				String prizeCode = RivaEDCode.passDecode(key1,key2,result.getPrizeCode());
				result.setPrizeCode(prizeCode);
			}
			if (!StringUtils.isEmpty(result.getPrizePsw())){
				String prizePsw = RivaEDCode.passDecode(key1,key2,result.getPrizePsw());
				result.setPrizePsw(prizePsw);
			}
		}
		return  result;