[cmd]修改bug

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

@@ -133,15 +133,15 @@ public class TaskService {
        String patientId = object.getString("patientId");
        SignFamily signFamily = signFamilyDao.findByPatient(patientId);
        if (signFamily == null){
            throw new Exception("该居民尚未签约，不能报名!");
            throw new Exception("已签约居民，才能报名！");
        }else if (signFamily!=null&&!signFamily.getExpensesStatus().equalsIgnoreCase("1")){
            throw new Exception("该居民尚未缴费，不能报名！");
            throw new Exception("已签约居民，才能报名！");
        }
        Patient patient = patientDao.findByCode(patientId);
        String unionId = object.getString("unionId");
        Patient patient1 = patientDao.findByUnionid(unionId);
        if (patient1 != null){
            throw new Exception("该居民已报过名!");
            throw new Exception("该居民已报名！");
        }
        patient.setUnionid(unionId);
        patientDao.save(patient);
@@ -179,18 +179,26 @@ public class TaskService {
      /*  List<Patient> patientList = new ArrayList<>();*/
        JSONObject object = new JSONObject();
        if (patient != null){
            SignFamily signFamily1 = signFamilyDao.findByPatient(patient.getCode());
            JSONObject object2 = (JSONObject) JSONObject.toJSON(patient);
            object2.put("hospital",signFamily1.getHospitalName());
            array.add(object2);
            String sql1 = "select * from wlyy_sign_family a where a.patient = '"+patient.getCode()+"'";
            List<SignFamily> signFamilyList = jdbcTemplate.query(sql1,new BeanPropertyRowMapper(SignFamily.class));
            if (signFamilyList != null&&signFamilyList.size()!=0){
                SignFamily signFamily1 = signFamilyList.get(0);
                JSONObject object2 = (JSONObject) JSONObject.toJSON(patient);
                object2.put("hospital",signFamily1.getHospitalName());
                array.add(object2);
            }
            /*patientList.add(patient);*/
            List<PatientFamilyMember> patientFamilyMemberList = patientFamilyMemberDao.findByPatient(patient.getCode());
            for (PatientFamilyMember patientFamilyMember:patientFamilyMemberList){
                Patient patient1 = patientDao.findByCode(patientFamilyMember.getFamilyMember());
                SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
                JSONObject object1 = (JSONObject) JSONObject.toJSON(patient);
                object1.put("hospital",signFamily.getHospitalName());
                array.add(object1);
                String sql2 = "select * from wlyy_sign_family a where a.patient = '"+patient1.getCode()+"'";
                List<SignFamily> signFamilyList2 = jdbcTemplate.query(sql2,new BeanPropertyRowMapper(SignFamily.class));
                if(signFamilyList2 != null&&signFamilyList2.size()!=0){
                    SignFamily signFamily = signFamilyList2.get(0);
                    JSONObject object1 = (JSONObject) JSONObject.toJSON(patient1);
                    object1.put("hospital",signFamily.getHospitalName());
                    array.add(object1);
                }
                /*patientList.add(patient1);*/
            }
            object.put("patientList",array);