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/web/third/synergy/SynergyManagerController.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -141,6 +141,9 @@ public class SynergyManageService extends BaseService {
            array.add(object);
        }
        buffer.deleteCharAt(buffer.length()-1);
        if (buffer.length()>5){
            buffer.deleteCharAt(buffer.length() -(buffer.length()-5));
        }
        com.alibaba.fastjson.JSONObject object = new com.alibaba.fastjson.JSONObject();
        object.put("type",type);
        object.put("serviceTime",serviceDate);