Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorOrderService.java

@@ -1576,8 +1576,8 @@ public class DoorOrderService {
    public File writeWordFile(List<String> orderId,HttpServletResponse response,String doctorCode) throws Exception {
        String zipFileName = "service_summary";
        String exportConclusionList = doctorCode+"exportList";
        String path = System.getProperty("user.dir") +"/service_summary/" + exportConclusionList;
        String exportConclusionList = "exportList";
        String path = System.getProperty("user.dir") +"/service_summary/"+doctorCode+"/" + exportConclusionList;
        System.out.println("path    :"   +path);
@@ -1586,13 +1586,13 @@ public class DoorOrderService {
        if (file.exists()) {
            if (file != null){
                deleteFolder(file);
                file.mkdir();
                file.mkdirs();
            }else {
                file.delete();
                file.mkdir();
                file.mkdirs();
            }
        }else {
            file.mkdir();
            file.mkdirs();
        }
        int j =1;
        for (int i = 0; i < orderId.size(); i++) {

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -1178,7 +1178,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        object.put("appcount",counts.size());
        object.put("sortList",counts1);
        object.put("medicalcount",0);//目前暂无医疗机构接入，默认0家。
        object.put("medicalcount",40);//目前暂无医疗机构接入，默认0家。
        return object;
    }