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

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/repository/doctor/SurveyStatisticsDao.java

@@ -4,6 +4,7 @@ import com.yihu.wlyy.entity.doctor.survey.SurveyStatistics;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
/**
 * Created by Reece on 2017/3/9.

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/PatientInfoService.java

@@ -1634,9 +1634,6 @@ public class PatientInfoService extends BaseService {
    public JSONObject getPatientJWInfo(String idcard)throws Exception{
        org.json.JSONArray jsonArray = jwArchivesService.getSickArchiveRecord(idcard);
        JSONObject rs = (JSONObject) jsonArray.get(0);
        if (rs==null){
            System.out.print("基卫查回来的数值为空");
        }
        String bd =  (String)rs.get("birthday");
        rs.put("birthday",bd.substring(0,10));
        String ct = String.valueOf(rs.get("zoneCode"));
@@ -1644,7 +1641,9 @@ public class PatientInfoService extends BaseService {
        if (c == null ){
            c = countryDao.findByCode(ct);
        }
        rs.put("zoneCode",c.getName());
        if (c!=null){
            rs.put("zoneCode",c.getName());
        }
        String sql ="SELECT " +
                " TIMESTAMPDIFF(YEAR,p.birthday,SYSDATE()) age, " +
                " p.photo " +

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

@@ -34,6 +34,7 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -43,6 +44,7 @@ import java.util.*;
 * @date 2018/1/28 20:20
 */
@Service
@Transactional
public class QuestionnaireService extends BaseService {
	
	private static final Logger logger = LoggerFactory.getLogger(QuestionnaireService.class);
@@ -423,11 +425,19 @@ public class QuestionnaireService extends BaseService {
		List<QuestionnaireWinningESDO> resultList = questionnaireLottery(questionnaireUsers);
		QuestionnaireWinningESDO result = new QuestionnaireWinningESDO();
		if (resultList!=null && resultList.size()>0){
			result = questionnaireLottery(questionnaireUsers).get(0);
			String prizeCode = RivaEDCode.passDecode(key1,key2,result.getPrizeCode());
			String prizePsw = RivaEDCode.passDecode(key1,key2,result.getPrizePsw());
			result.setPrizeCode(prizeCode);
			result.setPrizePsw(prizePsw);
			result = resultList.get(0);
			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;

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

@@ -860,8 +860,8 @@ public class EsStatisticsController extends BaseController {
                                   @RequestParam(required = true) String endDate) {
        try {
            return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo(getUID(), startDate, endDate));
            //return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("xh1D2017031502222",startDate,endDate));
            //return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo(getUID(), startDate, endDate));
            return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("xh1D2017031502222",startDate,endDate));
        } catch (Exception e) {
            error(e);