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

patient-co/patient-co-wlyy-job/src/main/resources/application-test.yml

@@ -87,9 +87,10 @@ images:
  sign_path: /usr/local/apache-tomcat-8.0.36/webapps/wlyy/images/familycontract.png
sign:
  check_upload: http://172.19.103.88:8011/wlyy_service
  zysoft: http://59.61.92.90:8072/wlyy_sign
quartz:
  name: schedulerFactoryBean_test

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/rehabilitation/RehabilitationManageService.java

@@ -356,10 +356,12 @@ public class RehabilitationManageService extends BaseService {
            json.put("patientName",patientName);
            json.put("age",age);
            json.put("sex",sex);
            String healthyConditionSql =" select  label_name from wlyy_sign_patient_label_info where status=1 and patient='"+patientCode+"' and label_type=8";
            String healthyConditionSql =" select  label_name,label from wlyy_sign_patient_label_info where status=1 and patient='"+patientCode+"' and label_type=8";
            List<Map<String,Object>> healthyConditionList = jdbcTemplate.queryForList(healthyConditionSql);
            String healthyCondition = healthyConditionList.size()>0?healthyConditionList.get(0).get("label_name")+"":"";
            String healthyConditionType = healthyConditionList.size()>0?healthyConditionList.get(0).get("label")+"":"";
            json.put("healthyCondition",healthyCondition);
            json.put("healthyConditionType",healthyConditionType);
            json.put("signHospitalName",signHospitalName);
            Patient patient = patientDao.findByCode(patientCode);
            json.put("photo",patient.getPhoto());
@@ -659,10 +661,12 @@ public class RehabilitationManageService extends BaseService {
            json.put("patientPhoto",p.getPhoto());
            json.put("patientName",p.getName());
            json.put("patientCode",p.getCode());
            String healthyConditionSql =" select  label_name from wlyy_sign_patient_label_info where status=1 and patient='"+p.getCode()+"' and label_type=8";
            String healthyConditionSql =" select  label_name,label from wlyy_sign_patient_label_info where status=1 and patient='"+p.getCode()+"' and label_type=8";
            List<Map<String,Object>> healthyConditionList = jdbcTemplate.queryForList(healthyConditionSql);
            String healthyCondition = healthyConditionList.size()>0?healthyConditionList.get(0).get("label_name")+"":"";
            String healthyConditionType = healthyConditionList.size()>0?healthyConditionList.get(0).get("label")+"":"";
            json.put("healthyCondition",healthyCondition);
            json.put("healthyConditionType",healthyConditionType);
            return json;
        }
        throw new Exception("请求微服务失败！");