Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActiveRecordController.java

@@ -42,7 +42,13 @@ public class ActiveRecordController extends EnvelopRestEndpoint {
            Integer originalStatus = object.getInteger("originalStatus");
            Integer currentStatus = object.getInteger("currentStatus");
            String patientId = object.getString("patientId");
            TaskPatientDetailDO taskPatientDetailDO = taskPatientDtailService.selectByPatientId(openId,idCard,unionId,taskCode);
            String taskId = object.getString("taskId");
            TaskPatientDetailDO taskPatientDetailDO = null;
            if (taskCode.equalsIgnoreCase("ACTIVITY_QUESTION")){
                taskPatientDetailDO = taskPatientDtailService.selectByPatientIdAndTaskId(openId,idCard,unionId,taskId);
            }else {
                taskPatientDetailDO = taskPatientDtailService.selectByPatientId(openId,idCard,unionId,taskCode);
            }
            if (taskPatientDetailDO == null){
                return MixEnvelop.getError("尚未报名！");
            }else {

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/TaskPatientDtailService.java

@@ -158,6 +158,17 @@ public class TaskPatientDtailService extends BaseJpaService<TaskPatientDetailDO,
    }
    public TaskPatientDetailDO selectByPatientIdAndTaskId(String openId,String idCard,String unionId,String taskId){
        logger.info("openId:"+openId+"idCard:"+idCard+"unionId:"+unionId+"taskCode:"+taskId);
        String sql ="select * from wlyy_health_bank_task_patient_detail where " +
                " (patient_idcard = '"+idCard+"' OR union_id ='"+unionId+"') AND task_id = '"+taskId+"'" ;
        List<TaskPatientDetailDO> taskPatientDetailDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(TaskPatientDetailDO.class));
        logger.info("参与信息："+taskPatientDetailDOS);
        return taskPatientDetailDOS.get(0);
    }
    /**
     * 获取参与详情
     *