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

# Conflicts:
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

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

@@ -666,7 +666,7 @@ public class CreditLogService {
        object.put("idCard",patient.getIdcard());
        object.put("openId",patient.getOpenid());
        object.put("unionId",patient.getUnionid());
        String url =/*getBaseUrl()*/"http://localhost:10051/svr-health-bank/"+ "addStepIntegrate";
        String url =getBaseUrl()+ "addStepIntegrate";
        Map<String,String> params = new HashMap<>();
        params.put("creditsDetail",object.toJSONString());
        try {

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

@@ -152,6 +152,7 @@ public class TaskService {
     */
    public JSONObject attendTask(JSONObject object) throws Exception {
        String response = null;
        logger.info(object.toJSONString());
        String patientId = object.getString("patientId");
        SignFamily signFamily = signFamilyDao.findByPatient(patientId);
        if (signFamily == null){
@@ -161,8 +162,9 @@ public class TaskService {
        }
        Patient patient = patientDao.findByCode(patientId);
        String unionId = object.getString("unionId");
        logger.info("前端unionId:"+unionId);
        String sql = "select * from wlyy.wlyy_patient p RIGHT JOIN wlyy_health_bank.wlyy_health_bank_task_patient_detail btpd ON p.code = btpd.patient_id where union_id = '"+patient.getUnionid()+
                "' and activity_id = '"+ object.get("activityId")+"' and patient_idcard ='"+patient.getIdcard()+"'";
                "' and activity_id = '"+ object.getString("activityId")+"' and patient_idcard ='"+patient.getIdcard()+"'";
        List<Patient> patientList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Patient.class));
        if (patientList != null && patientList.size()!=0){
            Patient patient1 = patientList.get(0);