commit

DataFusion/jfinal_demo.log

@@ -0,0 +1,9 @@
+
+2018-10-19 22:40:04
+[WARN]-[Thread: qtp1282811396-21]-[com.jfinal.core.ActionHandler.handle()]: 404 Action Not Found: /
+
+2018-10-19 22:40:07
+[WARN]-[Thread: qtp1282811396-19]-[com.jfinal.core.ActionHandler.handle()]: 404 Action Not Found: /
+
+2018-10-19 22:40:10
+[WARN]-[Thread: qtp1282811396-19]-[com.jfinal.core.ActionHandler.handle()]: 404 Action Not Found: /view

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -71,9 +71,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new OracleDialect());
 		me.add(arpConnected);
 		
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/10 * * * *", new DataTask());
-		me.add(cpData);
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/10 * * * *", new DataTask());
+//		me.add(cpData);
 
 //		Cron4jPlugin cp2 = new Cron4jPlugin();
 //		cp2.addTask("*/3 * * * *", new SyncTask2());

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

@@ -1,5 +1,7 @@
 package com.zskk.control;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -9,6 +11,7 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.zskk.model.Doctors;
 import com.zskk.model.Exams;
+import com.zskk.model.PatientInfos;
 import com.zskk.model.Report;
 import com.zskk.model.Studies;
 
@@ -26,18 +29,21 @@ public class ViewController extends Controller {
 				Record record = Db.use("connected").findFirst("select * from caller where STUDYUID=?",studies.getStudyuid());
 				Report report = new Report().use("zskk");
 				report.setId(creatId());
-				report.setReportDatetime(record.getDate("REPORTDATE"));
+				report.setReportDatetime(aaa(record.getStr("REPORTDATE")));
 				report.setImpression(record.getStr("IMPRESSION"));
-				report.setDescription(record.getStr("DESCRIPTION"));
-				report.setExamId(exams2.getId());
-				report.setCreatedAt(new Date());
-				report.setReportResult(record.getStr("FITEM_RESULT_CODE").contains("阴")?"1":"2");
-				report.setReportDoctorId(getDoctorIdByName(record.getStr("REPORTDOCTOR")));
-				report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setReviewDatetime(record.getDate("REPORTDATE"));
-				report.setConfirmDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setConfirmDatetime(record.getDate("REPORTDATE"));
+//				report.setDescription(record.getStr("DESCRIPTION"));
+//				report.setExamId(exams2.getId());
+//				report.setCreatedAt(new Date());
+//				report.setReportResult(record.getStr("FITEM_RESULT_CODE").contains("阴")?"1":"2");
+//				report.setReportDoctorId(getDoctorIdByName(record.getStr("REPORTDOCTOR")));
+//				report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
+//				report.setReviewDatetime(aaa(record.getStr("REPORTDATE")));
+//				report.setConfirmDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
+//				report.setConfirmDatetime(aaa(record.getStr("REPORTDATE")));
 				report.save();
+				PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
+				patientInfos.setName(record.getStr("PATIENTNAME"));
+				patientInfos.update();
 			}
 			this.renderJson(exams);
 		} catch (Exception e) {
@@ -46,15 +52,34 @@ public class ViewController extends Controller {
 		}
 	}
 	
-	private  String creatId() {
+	private String creatId() {
 		UUID id=UUID.randomUUID();
         String[] idd=id.toString().split("-");
         return idd[0]+idd[1]+idd[2];
 	}
 	
-	private  String getDoctorIdByName(String name) {
+	private String getDoctorIdByName(String name) {
+		if (name == null) {
+			return "1";
+		}
 		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM pacsonline.doctors where realname like ? and institution_id=73090001",name);
+		
 		return doctors.getId();
 	}
 	
+	private Date aaa(String timestr) {
+		if (timestr == null) {
+			return new Date();
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = null;
+		try {
+			date = sdf.parse(timestr);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return date;
+	}
+	
 }