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

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

@@ -1221,6 +1221,7 @@ public class SynergyManageService extends BaseJpaService {
                                String patientName,String ssc,String idcard,Integer userType,Integer isAcceptTask,String userName,String hospitalName,
                                HttpServletResponse response) throws Exception{
        WritableWorkbook wwb = null;
        OutputStream os = null;
        try{
            String servicerTable = " left join wlyy.manage_synergy_workorder_executor e on e.workorder_code=w.code AND e.del = 1  " ;
@@ -1333,14 +1334,14 @@ public class SynergyManageService extends BaseJpaService {
            response.setCharacterEncoding("utf-8");
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename="+ new String( "synergyManageList.xls"));
            OutputStream os = response.getOutputStream();
            os = response.getOutputStream();
            wwb = Workbook.createWorkbook(os);
            WritableSheet ws = wwb.createSheet("sheet",1);
            List<String> header = null;
            if(isAcceptTask==1||isAcceptTask==4){//我接收的任务
                header = new ArrayList<>(Arrays.asList("服务编号","服务类型","创建时间","服务对象","工单状态","需求方","负责人","服务内容"));
                header = new ArrayList<>(Arrays.asList("服务编号","服务类型","创建时间","服务对象","工单状态","需求方","负责人"));
            }else if(isAcceptTask==2){//我派发的任务
                header = new ArrayList<>(Arrays.asList("服务编号","服务类型","创建时间","服务对象","工单状态","家庭医生","所属机构","服务内容"));
                header = new ArrayList<>(Arrays.asList("服务编号","服务类型","创建时间","服务对象","工单状态","家庭医生","所属机构"));
            }else if(isAcceptTask==3){
                header = new ArrayList<>(Arrays.asList("服务编号","服务类型","服务时间","服务对象","备注","需求方"));
            }
@@ -1404,19 +1405,19 @@ public class SynergyManageService extends BaseJpaService {
                }else if(isAcceptTask==2) {//我派发的任务
                    addCell(ws, i, 6, one.get("hospital_name")+"","");//所属机构
                }
                if(isAcceptTask!=3){
                    addCell(ws, i, 7, one.get("content")+"","");//服务内容
                }
//                if(isAcceptTask!=3){
//
//                    addCell(ws, i, 7, one.get("content")+"","");//服务内容
//                }
                i++;
            }
            wwb.write();
            os.flush();
            os.close();
        }catch (Exception e) {
            e.printStackTrace();
            if(os!=null)os.close();
            throw e;
        }finally {
            if (wwb != null) wwb.close();
        }
    }