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/app/health/bank/TaskService.java

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

@@ -604,7 +604,7 @@ public class CreditLogService {
     */
    public JSONObject doctorAddIntegrate(JSONObject object){
        String response = null;
        String url ="http://localhost:10051/svr-health-bank/" + "doctorAddIntegrate";
        String url =getBaseUrl() + "doctorAddIntegrate";
        JSONArray array = object.getJSONArray("patientIds");
        JSONArray jsonArray  = new JSONArray();
        for (int i =0 ;i<array.size();i++){
@@ -647,7 +647,7 @@ public class CreditLogService {
        object.put("idCard",patient.getIdcard());
        object.put("openId",patient.getOpenid());
        object.put("unionId",patient.getUnionid());
        String url ="http://localhost:10051/svr-health-bank/" + "addStepIntegrate";
        String url =getBaseUrl()+ "addStepIntegrate";
        Map<String,String> params = new HashMap<>();
        params.put("creditsDetail",object.toJSONString());
        try {