Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java

@@ -210,7 +210,7 @@ public class CustomerSynergyManageController extends BaseController {
    @ApiOperation(value = "获取催单列表")
    public String reminderList(@ApiParam(name="userCode",value="客服code",required = false)
                               @RequestParam(required = false)String userCode,
                               @ApiParam(name="receiveType",value="客服角色（1、客服，2、客服负责人）",required = false)
                               @ApiParam(name="receiveType",value="客服角色（1、客服，2、客服管理员）",required = false)
                               @RequestParam(required = false)Integer receiveType,
                               @ApiParam(name="sortType",value="排序（1、升序，2、降序）",required = false,defaultValue = "1")
                               @RequestParam(required = false,defaultValue = "1")Integer sortType,

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

@@ -891,7 +891,8 @@ public class SynergyManageService extends BaseJpaService {
                 " LEFT JOIN manage_synergy_workorder_executor e on r.workorder_code=e.workorder_code " +
                 " where e.executor_code='"+userCode+"' and e.del=1 and r.deal_with=0 " +sort;
        }else if(receiveType==2){
            sql =" select r.* from manage_synergy_workorder_reminder r where r.principal_code='"+userCode+"' and r.deal_with=0 "+sort;
            sql =" select r.* from manage_synergy_workorder_reminder r " +
                 " LEFT JOIN manage_synergy_workorder w on r.workorder_code=w.code where w.status=1 and r.deal_with=0 "+sort;
        }
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sql);
        int count = 0;