Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/bank/TaskService.java

@@ -161,13 +161,15 @@ public class TaskService {
        }
        Patient patient = patientDao.findByCode(patientId);
        String unionId = object.getString("unionId");
        if(StringUtils.isNoneBlank(patient.getUnionid())){
            throw new Exception("该居民已报名！");
        }else {
            Patient patient1 = patientDao.findByUnionid(unionId);
            if (patient1 != null){
        String sql = "select * from wlyy.wlyy_patient p RIGHT JOIN wlyy_health_bank.wlyy_health_bank_task_patient_detail btpd ON p.code = btpd.patient_id where union_id = '"+patient.getUnionid()+
                "' and activity_id = '"+ object.get("activityId")+"' and patient_idcard ='"+patient.getIdcard()+"'";
        List<Patient> patientList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Patient.class));
        if (patientList != null && patientList.size()!=0){
            Patient patient1 = patientList.get(0);
            if(StringUtils.isNoneBlank(patient.getUnionid())&&patient1!=null){
                throw new Exception("该居民已报名！");
            }
        }else {
            patient.setUnionid(unionId);
            patientDao.save(patient);
        }