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

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/OldPeoplePhysicalExaminationSynJob.java

@@ -31,7 +31,7 @@ public class OldPeoplePhysicalExaminationSynJob implements Job {
			String enddate = DateUtil.getNextDay(DateUtil.getStringDateShort(),-1) + " 23:59:59";
			
			//根据起止时间查询家签慢病患者定标情况,并同步到本地数据库
			jwPrescriptionService.getPatientDiseaseContentMapByTime(startdate,enddate);
			jwPrescriptionService.getOldPeoplePhysicalExaminationByTime(startdate,enddate);
			
			logger.info("END========老年人体检记录同步JOB");
		}catch (Exception e){

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

@@ -847,13 +847,11 @@ public class DateUtil {
	}
	
	/**
	 * 转换日期字符串为Timestamp
	 * 转换日期字符串为Timestamp YYYY-MM-DD HH:MM:SS
	 * @return
	 */
	public static Timestamp fomrmatStringToTimeStamp(String dateStr){
		
		dateStr = getStringDate(YYYY_MM_DD_HH_MM_SS);
		
		Timestamp ts = Timestamp.valueOf(dateStr);
		
		return ts;