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

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

@@ -18,6 +18,7 @@ public class ManageSynergyAccessoryDO extends IdEntity {
    private String url;//文件存储路径
    private String workorderCode;//工单的code
    private Integer del;//逻辑删除（0、有效，1、删除）
    private Integer type;//1、Excel，2、word，3、图片
    @Column(name = "code")
    public String getCode() {
@@ -63,4 +64,13 @@ public class ManageSynergyAccessoryDO extends IdEntity {
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
}

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

@@ -495,7 +495,7 @@ public class SynergyManageService extends BaseJpaService {
            whereSql+=" and s.status=1 ";
        }
        String sql =" select DISTINCT w.*,s.mobile,s.service_patient_name,s.service_patient_code,s.code as servicerCode,s.town_name,s.hospital_name, " +
                " w.create_user_name " ;
                " w.create_user_name ,s.relation_code as serviserRelationCode " ;
        String sqlCenter = " from manage_synergy_workorder_servicer s " +
                " LEFT JOIN manage_synergy_workorder w on s.workorder_code=w.code " +
                " LEFT JOIN manage_synergy_workorder_executor e on e.workorder_code=w.code " + leftSql+
@@ -588,6 +588,7 @@ public class SynergyManageService extends BaseJpaService {
                resultMap.put("servicerLog",m);
                resultMap.put("haveNum",1);
            }
            resultMap.put("serviserRelationCode",workorderMap.get("serviserRelationCode"));
        }else{
            resultMap.put("haveNum",0);
        }
@@ -1164,6 +1165,18 @@ public class SynergyManageService extends BaseJpaService {
        for(int i=0;i<jsonArray.length();i++){
            fileName = jsonArray.getJSONObject(i).get("name")+"";
            url = jsonArray.getJSONObject(i).get("url")+"";
            String[] fs = fileName.split("\\.");
            String format = fs[1];
            //图片常见格式：bmp,jpg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,WMF,webp
            List img = new ArrayList(Arrays.asList("bmp","jpg","png","tif","gif","pcx","tga","exif","fpx","svg","psd","cdr","pcd","dxf","ufo","eps","ai","raw","WMF","webp"));
            Integer type =null;
            if(img.contains(format)){
                type=3;
            }else if("docx".equals(format)||"doc".equals(format)){
                type=2;
            }else if("xls".equals(format)||"xlsx".equals(format)){
                type=1;
            }
            ManageSynergyAccessoryDO manageSynergyAccessoryDO = new ManageSynergyAccessoryDO();
            manageSynergyAccessoryDO.setCode(getCode());
            manageSynergyAccessoryDO.setDel(0);
@@ -1180,6 +1193,7 @@ public class SynergyManageService extends BaseJpaService {
        manageSynergyWorkorderDO.setStatus(3);
        manageSynergyWorkorderDO.setCompleteTime(new Date());
        workOrderDao.save(manageSynergyWorkorderDO);
        sendMessage(manageSynergyWorkorderDO ,user, 27);
    }
    public JSONObject getLabels(String labelType) {