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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -521,6 +521,18 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        JSONObject tmp = res.getJSONObject("patient");
        tmp.put("deviceType",deviceService.getPatientDeviceCategoryCode(patientId));
        res.put("patient",tmp);
        //获取i健康信息
        String iSql = "select p.code,p.name,IF(s.id is null,'0','1') isSign from wlyy.wlyy_patient p " +
                "LEFT JOIN wlyy.wlyy_sign_family s on p.code = s.patient and s.status>0 " +
                "where p.idcard='"+patientDO.getIdcard()+"' and p.status=1 limit 1";
        List<Map<String,Object>> ihealthList = jdbcTemplate.queryForList(iSql);
        if(ihealthList.size()>0){
            res.put("ihealthPatient",ihealthList.get(0));
        }else {
            res.put("ihealthPatient",null);
        }
        return res;
    }

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -507,7 +507,9 @@ public class RehabilitationManageService {
        sql = TransforSqlUtl.wlyy_rehabilitation_plan_detailAll2(sql);
        List<Map<String,Object>> rehabilitationDetailList = jdbcTemplate.queryForList(sql);
        String planPatientSql = " SELECT patient FROM wlyy_specialist.wlyy_patient_rehabilitation_plan INNER JOIN wlyy_sign_family f ON p.patient = f.patient  WHERE id in ("+planCondition+" ) AND `status` = 1 AND expenses_status = 1 AND  doctor = '"+doctorCode+"' ";
        String planPatientSql = " SELECT p.patient FROM wlyy_specialist.wlyy_patient_rehabilitation_plan p " +
                "INNER JOIN wlyy.wlyy_sign_family f ON p.patient = f.patient  WHERE p.id in ("+planCondition+" ) " +
                "AND f.`status` = 1 AND f.expenses_status = 1 AND  f.doctor = '"+doctorCode+"' ";
        List<Map<String, Object>> patientCodeList = jdbcTemplate.queryForList(planPatientSql);
        List<Map<String, Object>> list = null;