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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -268,7 +268,7 @@ public class MessageService extends BaseService {
            pagesize = 10;
        }
        // 排序
        Sort sort = new Sort(Direction.DESC, "id","read");
        Sort sort = new Sort(Direction.DESC, "id");
        // 分页信息
        PageRequest pageRequest = new PageRequest(0, pagesize, sort);
        // 设置查询条件
@@ -301,4 +301,9 @@ public class MessageService extends BaseService {
        jo.put("date",DateString);
        return jo;
    }
    public void changeMessageToRead(Long id) {
        Message message= messageDao.findOne(id);
        message.setRead(1);
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1779,5 +1779,7 @@ public class FamilyContractService extends BaseService {
    public List<SignFamily> findAllSignByPatient(String patient) {
        return signFamilyDao.findAllSignByPatient(patient);
    }
    public List<SignFamily> findNoHealthSignFamilyNum(String doctor) {
        return signFamilyDao.findNoHealthSignFamilyNum(doctor);
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/DateUtil.java

@@ -165,7 +165,13 @@ public class DateUtil {
		SimpleDateFormat formatter = new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS);
		return formatter.format(dateDate);
	}
	public static String dateToStrNoSecond(java.util.Date dateDate) {
		if (dateDate == null) {
			return "";
		}
		SimpleDateFormat formatter = new SimpleDateFormat(YYYY_MM_DD_HH_MM);
		return formatter.format(dateDate);
	}
	/**
	 * 将长时间格式时间转换为字符串 yyyy-MM-dd
	 * 

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/WeixinBaseController.java

@@ -246,7 +246,7 @@ public class WeixinBaseController extends BaseController {
	 * 
	 * @return
	 */
	public String fetchWxImages() {
	public String Images() {
		String photos = "";
		try {
			String images = request.getParameter("mediaIds");
@@ -326,7 +326,84 @@ public class WeixinBaseController extends BaseController {
		}
		return null;
	}
	
	public String saveImageToDiskNoImageCompress(String mediaId) throws Exception {
		// 文件保存的临时路径
		String tempPath = SystemConf.getInstance().getImagePath() + File.separator;
		// 拼接年月日路径
		String datePath = DateUtil.getStringDate("yyyy") + File.separator + DateUtil.getStringDate("MM") + File.separator + DateUtil.getStringDate("dd") + File.separator;
		// 重命名文件
		String newFileName = DateUtil.dateToStr(new Date(), DateUtil.YYYYMMDDHHMMSS) + "_" + new Random().nextInt(1000) + ".png";
		// 保存路径
		File uploadFile = new File(tempPath + datePath + newFileName);
		InputStream inputStream = null;
		FileOutputStream fileOutputStream = null;
		try {
			if (!uploadFile.getParentFile().exists()) {
				uploadFile.getParentFile().mkdirs();
			}
			inputStream = getInputStream(mediaId);//下载微信图片
			byte[] data = new byte[1024];
			int len = 0;
			fileOutputStream = new FileOutputStream(uploadFile);
			while ((len = inputStream.read(data)) != -1) {
				fileOutputStream.write(data, 0, len);
			}
			// 生成缩略图
			//ImageCompress.compress(uploadFile.getAbsolutePath(), uploadFile.getAbsolutePath() + "_small", 300, 300);
			// 返回保存路径
			return datePath + newFileName;
		} catch (IOException e) {
			e.printStackTrace();
		} finally {
			if (inputStream != null) {
				try {
					inputStream.close();
				} catch (IOException e) {
					e.printStackTrace();
				}
			}
			if (fileOutputStream != null) {
				try {
					fileOutputStream.close();
				} catch (IOException e) {
					e.printStackTrace();
				}
			}
		}
		return null;
	}
	/**
	 * 获取微信服务器图片
	 *
	 * @return
	 */
	public String fetchWxImages() {
		String photos = "";
		try {
			String images = request.getParameter("mediaIds");
			if (StringUtils.isEmpty(images)) {
				return photos;
			}
			String[] mediaIds = images.split(",");
			for (String mediaId : mediaIds) {
				if (StringUtils.isEmpty(mediaId)) {
					continue;
				}
				String temp = saveImageToDisk(mediaId);
				if (StringUtils.isNotEmpty(temp)) {
					if (photos.length() == 0) {
						photos = temp;
					} else {
						photos += "," + temp;
					}
				}
			}
		} catch (Exception e) {
			error(e);
		}
		return photos;
	}
	/**
	 * 获取微信服务器语音
	 * 

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@@ -33,7 +33,61 @@ import com.yihu.wlyy.web.BaseController;
@RequestMapping(value = "/upload", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "文件上传")
public class FileUploadController extends BaseController {
	/**
	 * 患者头像上传
	 * @return
	 * @throws IOException
	 * @throws IllegalStateException
	 */
	@RequestMapping(value = "patientPhoto", method = RequestMethod.POST/* , headers = "Accept=image/png" */)
	@ResponseBody
	public String patientPhoto(HttpServletRequest request, HttpServletResponse response,String photo) {
		// 圖片列表
		//List<File> images = new ArrayList<File>();
		//List<String> tempPaths = new ArrayList<String>();
		// 文件保存的临时路径
		//String tempPath = SystemConf.getInstance().getImagePath() + File.separator;
		// 拼接年月日路径
		//String datePath = DateUtil.getStringDate("yyyy") + File.separator + DateUtil.getStringDate("MM") + File.separator + DateUtil.getStringDate("dd") + File.separator;
		try {
			MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
			Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
			// 创建文件夹
			//File file = new File(tempPath + datePath);
			//if (!file.exists()) {
			//	file.mkdirs();
			//}
			String fileName = null;
			String  firstPhoto=null;
			for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
				// 上传文件
				MultipartFile mf = entity.getValue();
				fileName = mf.getOriginalFilename();
				String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
				// 重命名文件
				  firstPhoto=photo.substring(0,photo.lastIndexOf("."))+"_small."+fileExt;
				File uploadFile = new File(firstPhoto);
				// 拷贝文件流到指定文件路径
				FileCopyUtils.copy(mf.getBytes(), uploadFile);
				// 生成缩略图
				//ImageCompress.compress(uploadFile.getAbsolutePath(), uploadFile.getAbsolutePath() + "_small", 300, 300);
				// 添加到上传成功数组中
				//images.add(uploadFile);
				//tempPaths.add(datePath + newFileName);
			}
			String urls = firstPhoto;
			JSONObject json = new JSONObject();
			json.put("status", 200);
			json.put("msg", "上传成功");
			// 图片标识对象的HTTP链接
			json.put("urls", urls);
			System.out.println("图片上传：" + json.toString());
			return json.toString();
		} catch (Exception e) {
			error(e);
			return error(-1, "上传失败");
		}
	}
	/** 
	 * 图片上传 
	 * @return 
@@ -243,4 +297,5 @@ public class FileUploadController extends BaseController {
		}
	}
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/message/DoctorMessageController.java

@@ -232,12 +232,12 @@ public class DoctorMessageController extends BaseController {
				json.put("senderName", msg.getSenderName());
				// 发送人头像
				json.put("senderPhoto", msg.getSenderPhoto());
				// 是否已读：1未读，0已读
				// 是否已读：1已读，0未读
				json.put("read", msg.getRead());
				// 是否已读：
				json.put("sex", msg.getSex());
				// 发送时间
				json.put("czrq", DateUtil.dateToStrLong(msg.getCzrq()));
				json.put("czrq", DateUtil.dateToStrNoSecond(msg.getCzrq()));
				array.put(json);
			}
			return write(200, "获取消息成功！", "list", array);
@@ -263,4 +263,21 @@ public class DoctorMessageController extends BaseController {
			return error(-1, "获取消息失败！");
		}
	}
	/**
	 * @param id
	 * @return
	 */
	@RequestMapping(value = "changeMessageToRead")
	@ResponseBody
	public String changeMessageToRead(Long id) {
		try {
			 messageService.changeMessageToRead(id);
			return write(200, "修改成功！");
		} catch (Exception e) {
			error(e);
			return error(-1, "获取消息失败！");
		}
	}
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -834,7 +834,30 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            return error(-1, "查询失败");
        }
    }
    /**
     * 获取没有健康管理师的签约数据数目
     *
     * @param doctor 医生code
     * @return
     */
    @RequestMapping(value = "/findNoHealthSignFamilyNum")
    @ResponseBody
    public String findNoHealthSignFamilyNum(String doctor) {
        try {
            List<SignFamily> signFamily = familyContractService.findNoHealthSignFamilyNum(doctor);
            JSONObject jo = new JSONObject();
            if (signFamily != null && signFamily.size() > 0) {
                jo.put("date", DateUtil.dateToStr(signFamily.get(0).getCzrq(), "yyyy-MM-dd"));
                jo.put("num", signFamily.size());
            } else {
                jo.put("num", 0);
            }
            return write(200, "查询成功", "data", jo);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
    /**
     * 缴费消息提醒
     *

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -125,7 +125,23 @@ public class PatientController extends WeixinBaseController {
            return invalidUserException(e, -1, "患者信息查询失败！");
        }
    }
    /**
     * 患者微信圖片信息保存
     * @param mediaIds    頭像
     * @return
     */
    @RequestMapping(value = "saveWXPhote")
    @ResponseBody
    public String saveWXPhote(String mediaIds) {
        try {
            //下載微信的圖片保存到自己的服務器
            String photo = saveImageToDiskNoImageCompress(mediaIds);
            return photo;
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "保存失败！");
        }
    }
    /**
     * 患者基本信息保存
     *
@@ -162,7 +178,6 @@ public class PatientController extends WeixinBaseController {
//                photo = CommonUtil.copyTempImage(photo);
//            }
            if (StringUtils.isNotEmpty(photo)) {
                photo=SystemConf.getInstance().getImageServer()+photo;//添加图片保存完整的路径
                patient.setPhoto(photo);
            }
            if (StringUtils.isNotEmpty(name))