commit

DataFusion/src/com/zskk/control/ViewController.java

@@ -84,7 +84,7 @@ public class ViewController extends Controller {
 			String diagnosis = xmlHelper.getString("//diagnosis");
 			aaString = phone+"~"+idcard+"~"+department+aaString;
 //			this.renderText(department+"~"+clinicaldoctor+"~"+reportdate+"~"+description+"~"+impression+"~"+reportdoctor+"~"+reviewdoctor+"~"+phone+"~"+idcard+"~"+diagnosis);
-			this.renderText(phone==null?"1":"2" + parseStringToDate(reportdate).toString());
+			this.renderText(phone==null?"1":"2" + parseStringToDate(reportdate));
 			Map<String, String> params = new HashMap<>();
 			params.put("exam_id", "cnb5089doo6pm476");
 			// 报告医生姓名
@@ -122,7 +122,7 @@ public class ViewController extends Controller {
 			params.put("report_result", "0");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
-				dService.saveReport(params);
+//				dService.saveReport(params);
 			});
 		
 			}catch (Exception ex) {
@@ -167,19 +167,25 @@ public class ViewController extends Controller {
 	 * @param dateStr
 	 * @return
 	 */
-	private Date parseStringToDate(String dateStr) {
+	private String parseStringToDate(String dateStr) {
 		if (dateStr == null) {
-			return new Date();
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			String dateStringnew = formatter.format(new Date());
+			return dateStringnew;
 		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-	    Date date = null;
+		Date date = null;
+		String dateString = "";
 		try {
 			date = sdf.parse(dateStr);
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			dateString = formatter.format(date);
+
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-        return date;
+		return dateString;
 	}
 
 	public static void main(String[] args) {