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

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

@@ -475,7 +475,7 @@ public class CustomerSynergyManageController extends BaseController {
        }
    }
    @RequestMapping(value = "exportWorkorder", method = RequestMethod.GET)
    @RequestMapping(value = "exportWorkorder", method = RequestMethod.GET,produces = "application/json;charset=UTF-8")
    @ApiOperation("客服系统-协同服务列表")
    public String exportWorkorder(@ApiParam(name = "userCode", value = "客服code", required = false)
                                @RequestParam(value = "userCode", required = false)String userCode,

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/synergy/ManageSynergyWorkorderDO.java

@@ -25,6 +25,7 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    private String createUserName;//创建人名称
    private String remark;//备注
    private Integer createUserType;//创建人类型（1、医生，2、客服）
    private Integer createUserRole;//创建人角色（1、普通，2、管理员）
    private Integer del;//逻辑删除（0、有效，1、删除）
    private String content;//服务内容
    private String relationCode;//根据type关联业务code
@@ -266,4 +267,13 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    public void setReceiverTime(Date receiverTime) {
        this.receiverTime = receiverTime;
    }
    @Column(name = "create_user_role")
    public Integer getCreateUserRole() {
        return createUserRole;
    }
    public void setCreateUserRole(Integer createUserRole) {
        this.createUserRole = createUserRole;
    }
}

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

@@ -272,6 +272,8 @@ public class SynergyManageService extends BaseJpaService {
            map.put("hospitalName",one.get("hospital_name"));
            map.put("servicerKey",one.get("servicer_key"));
            map.put("remark",one.get("remark"));
            map.put("relationCode",one.get("relation_code"));
            map.put("relationCodeName",one.get("relation_code_name"));
            if(workorderTypeR==0||workorderTypeR==2||workorderTypeR==3){
                servicerList = workorderServicerDao.findByWorkorderCode(one.get("code")+"");
                if(servicerList.size()>0){
@@ -1241,8 +1243,9 @@ public class SynergyManageService extends BaseJpaService {
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            //生成excel
            response.setCharacterEncoding("utf-8");
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename="+ new String( "patientHealthIndexDataList.xls"));
            response.setHeader("Content-Disposition", "attachment; filename="+ new String( "synergyManageList.xls"));
            OutputStream os = response.getOutputStream();
            wwb = Workbook.createWorkbook(os);
            WritableSheet ws = Workbook.createWorkbook(os).createSheet("sheet",1);
@@ -1261,6 +1264,7 @@ public class SynergyManageService extends BaseJpaService {
            Integer workorderTypeR = null;
            String workorderTypeName = null;
            Date createTime = null;
            i=0;
            for(Map<String,Object> one:list){
                workorderTypeR = (Integer) one.get("workorder_type");
                createTime = (Date)one.get("create_time");