commit

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

@@ -90,25 +90,25 @@ public class ZskkConfig extends JFinalConfig {
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
 		
-//		//同步报告
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/4 * * * *", new DataTask());
-//		me.add(cpData);
-//		
-//		//将cfind请求检查录入待检查库
-//		Cron4jPlugin inData = new Cron4jPlugin();
-//		inData.addTask("*/6 * * * *", new UpdateTask());
-//		me.add(inData);
-//		
-////		//同步更新报告
+		//同步报告
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/4 * * * *", new DataTask());
+		me.add(cpData);
+		
+		//将请求检查录入待检查库
+		Cron4jPlugin inData = new Cron4jPlugin();
+		inData.addTask("*/6 * * * *", new UpdateTask());
+		me.add(inData);
+		
+//		//同步更新报告
 //		Cron4jPlugin upData = new Cron4jPlugin();
 //		upData.addTask("*/12 * * * *", new ReviewTask());
 //		me.add(upData);
-////		
-////		//smb下载
-//		Cron4jPlugin reData = new Cron4jPlugin();
-//		reData.addTask("*/3 * * * *", new ReCMoveTask());
-//		me.add(reData);
+//		
+		//smb下载
+		Cron4jPlugin reData = new Cron4jPlugin();
+		reData.addTask("*/3 * * * *", new ReCMoveTask());
+		me.add(reData);
 //		
 //		//补全下载
 //		Cron4jPlugin bcData = new Cron4jPlugin();

DataFusion/src/com/zskk/task/DataTask.java

@@ -25,7 +25,7 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(400);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where SELECTSTUDYINSUID=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
@@ -56,22 +56,22 @@ public class DataTask implements ITask {
 			params.put("description", record.getStr("DESCRIPTION"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("REQDEPT")==null?"":record.getStr("REQDEPT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("REQDOCTOR")==null?"":record.getStr("REQDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+			params.put("clin_diag", "");
 			//症状
-			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
+			params.put("clin_symp", "");
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("PATNAME"));
 			//患者手机号
 			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
 			//患者身份证号
 			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("RESULT").contains("是")?"2":"1");
+			params.put("report_result", "0");
 			//门诊号住院号
 			params.put("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
 			//门诊号
@@ -79,7 +79,7 @@ public class DataTask implements ITask {
 			//病人ID
 //			params.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
 			//检查方法
-			params.put("exam_project", record.getStr("PROJECT")==null?"":record.getStr("PROJECT"));
+			params.put("exam_project", record.getStr("PROJECT")==null?"":record.getStr("EXAMITEM"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);

DataFusion/src/com/zskk/task/ReCMoveTask.java

@@ -20,7 +20,7 @@ public class ReCMoveTask implements ITask {
 		DataService dService = ServiceFactory.getService(DataService.class);
 		Record recordfind = Db.use("local").findFirst("select * from study where status=1 order by createAt asc");
 //		JSONArray array = dService.getImage(recordfind.getStr("accessionNumber"));
-		List<Record> array = Db.use("connected").find("SELECT * FROM studyinfo where ACCESSIONNUMBER=?",recordfind.getStr("studyuid"));
+		List<Record> array = Db.use("connected").find("SELECT * FROM ImageInfo where SELECTSTUDYINSUID=?",recordfind.getStr("studyuid"));
 
 		if (array==null) {
 			recordfind.set("status", 2);
@@ -33,10 +33,10 @@ public class ReCMoveTask implements ITask {
 		recordfind.set("updateAt", parseStringToDateTime());
 		Db.use("local").update("study",recordfind);
 		for (Record object : array) {
-			recordfind.set("modalities", object.getStr("F_MODALITY"));
-			String[] strings = object.getStr("YYK_PATHNAME").split("\\\\");
-//			int len = strings.length;
-			dService.downloadFileToFolder("smb://pacs:pacs@"+strings[2], "/"+strings[3]+"/"+strings[4], strings[5],"/home/zskk/SMB_FILE",null);
+//			recordfind.set("modalities", object.getStr("F_MODALITY"));
+			String[] strings = object.getStr("FILEPATH").split("\\\\");
+			int len = strings.length;
+			dService.downloadFileToFolder("smb://administrator:Passw0rd@192.168.8.21/PACS/sht/", strings[len-4] +"/" + strings[len-3] + "/" + strings[len-2], strings[len-1],"/home/zskk/SMB_FILE",null);
 		}
 		recordfind.set("status", 3);
 		recordfind.set("updateAt", parseStringToDateTime());

DataFusion/src/com/zskk/task/UpdateTask.java

@@ -21,33 +21,18 @@ public class UpdateTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-		List<Record> records = Db.use("connected").find("SELECT * FROM (SELECT ACCESSIONNUMBER,STUDYTIME FROM studyinfo group BY STUDYTIME,ACCESSIONNUMBER order by STUDYTIME desc)WHERE ROWNUM <= 20");
-		for (Record record : records) {
-			String studyuidString = record.getStr("ACCESSIONNUMBER");
-			String modalitiesString = "";
-
-			Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?",
-					studyuidString);
-			if (studyidfind == null) {
-				Record studyinfo = new Record().set("studyuid", studyuidString).set("modalities", modalitiesString)
-						.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
-				Db.use("local").save("study", studyinfo);
-			}
+		List<Record> records = Db.use("connected").find("select * from examinfo where REQDATE > TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS')",parseStringToDate());
+		if (records==null) {
+			return;
 		}
-		//补充RF
-		List<Record> recordsrf = Db.use("connected").find("SELECT * FROM (SELECT ACCESSIONNUMBER,STUDYTIME FROM studyinfo where F_MODALITY='RF' group BY STUDYTIME,ACCESSIONNUMBER order by STUDYTIME desc)WHERE ROWNUM <= 10");
-		for (Record record : recordsrf) {
-			String studyuidString = record.getStr("ACCESSIONNUMBER");
-			String modalitiesString = "";
-
-			Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?",
-					studyuidString);
-			if (studyidfind == null) {
-				Record studyinfo = new Record().set("studyuid", studyuidString).set("modalities", modalitiesString)
-						.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
-				Db.use("local").save("study", studyinfo);
+		for (Record record : records) {
+			Record recordfind = Db.use("local").findFirst("select * from study where studyuid=?",record.getStr("SELECTSTUDYINSUID"));
+			if (recordfind!=null) {
+				continue;
 			}
-		}
+			Record study = new Record().set("studyuid", record.getStr("SELECTSTUDYINSUID")).set("modalities", record.getStr("MODALITY")).set("status", 1).set("imageNum", 0).set("createAt", getDateStr()).set("updateAt", getDateStr());
+			Db.use("local").save("study", study);
+		}	
 	}
 
 	@Override
@@ -84,5 +69,18 @@ public class UpdateTask implements ITask {
 		return daString;
 
 	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String getDateStr() {
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = new Date();
+	    String timeString = null;
+		timeString = sdf.format(date);
+        return timeString;
+	}
 
 }