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

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

@@ -139,12 +139,16 @@ public class TaskService {
        }
        Patient patient = patientDao.findByCode(patientId);
        String unionId = object.getString("unionId");
        Patient patient1 = patientDao.findByUnionid(unionId);
        if (patient1 != null){
        if(patient.getUnionid() != null){
            throw new Exception("该居民已报名！");
        }else {
            Patient patient1 = patientDao.findByUnionid(unionId);
            if (patient1 != null){
                throw new Exception("该居民已报名！");
            }
            patient.setUnionid(unionId);
            patientDao.save(patient);
        }
        patient.setUnionid(unionId);
        patientDao.save(patient);
        object.put("unionId",unionId);
        object.put("patientIdcard",patient.getIdcard());
        object.put("patientOpenid",patient.getOpenid());