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

@@ -187,7 +187,7 @@ public class TaskService {
      /*  List<Patient> patientList = new ArrayList<>();*/
        JSONObject object = new JSONObject();
        if (patient != null){
            String sql1 = "select * from wlyy_sign_family a where a.patient = '"+patient.getCode()+"'";
            String sql1 = "select * from wlyy_sign_family a where a.patient = '"+patient.getCode()+"' AND status = 1";
            List<SignFamily> signFamilyList = jdbcTemplate.query(sql1,new BeanPropertyRowMapper(SignFamily.class));
            if (signFamilyList != null&&signFamilyList.size()!=0){
                SignFamily signFamily1 = signFamilyList.get(0);
@@ -199,7 +199,7 @@ public class TaskService {
            List<PatientFamilyMember> patientFamilyMemberList = patientFamilyMemberDao.findByPatient(patient.getCode());
            for (PatientFamilyMember patientFamilyMember:patientFamilyMemberList){
                Patient patient1 = patientDao.findByCode(patientFamilyMember.getFamilyMember());
                String sql2 = "select * from wlyy_sign_family a where a.patient = '"+patient1.getCode()+"'";
                String sql2 = "select * from wlyy_sign_family a where a.patient = '"+patient1.getCode()+"' AND status = 1";
                List<SignFamily> signFamilyList2 = jdbcTemplate.query(sql2,new BeanPropertyRowMapper(SignFamily.class));
                if(signFamilyList2 != null&&signFamilyList2.size()!=0){
                    SignFamily signFamily = signFamilyList2.get(0);
@@ -248,12 +248,16 @@ public class TaskService {
     */
    public JSONObject getStepNumber(){
        String step = redisTemplate.opsForValue().get(STEP);
        logger.info(step);
        String step1 = systemDictDao.findByDictNameAndCode("HEALTH_STEP","HEALTH_STEP");
        logger.info(step1);
        JSONObject jsonObject = JSONObject.parseObject(step1);
        if (step1 != null && step.equalsIgnoreCase(step1)){
            logger.info(jsonObject.toString());
            return jsonObject;
        }else {
            redisTemplate.opsForValue().set(STEP,step1);
            logger.info(jsonObject.toString());
            return jsonObject;
        }
    }