commit

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

@@ -79,9 +79,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new MysqlDialect());
 		me.add(arpConnected);
 
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/5 * * * *", new DataTask());
+		me.add(cpData);
 
 //		Cron4jPlugin cp2 = new Cron4jPlugin();
 //		cp2.addTask("*/15 * * * *", new UpdateTask());

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

@@ -40,32 +40,32 @@ public class DataTask implements ITask {
 			for (Exams exams2 : exams) {
 				try {
 					Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-					Record record = Db.use("connected").findFirst("select * from third_view_zskk where STUDYUID=?",
+					Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",
 							studies.getStudyuid());
 					if (record == null) {
 						continue;
 					}
 					Report report = new Report().use("zskk");
 					report.setId(creatId());
-					report.setReportDatetime(parseStringToDate(record.getStr("REPORTDATE")));
-					if (record.getStr("description") == null || record.getStr("IMPRESSION") == null
+					report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
+					if (record.getStr("description") == null || record.getStr("impression") == null
 							|| record.getStr("description").isBlank()) {
 						continue;
 					}
 					report.setImpression(record.getStr("description"));
-					report.setDescription(record.getStr("IMPRESSION"));
+					report.setDescription(record.getStr("impression"));
 					report.setExamId(exams2.getId());
 					report.setCreatedAt(new Date());
-					report.setReportDoctorId(getDoctorIdByName(record.getStr("REPORTDOCTOR")));
-					report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-					report.setReviewDatetime(parseStringToDate(record.getStr("REPORTDATE")));
-					report.setConfirmDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-					report.setConfirmDatetime(parseStringToDate(record.getStr("REPORTDATE")));
+					report.setReportDoctorId(getDoctorIdByName(record.getStr("reportdoctor")));
+					report.setReviewDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
+					report.setReviewDatetime(parseStringToDate(record.getStr("reportdate")));
+					report.setConfirmDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
+					report.setConfirmDatetime(parseStringToDate(record.getStr("reportdate")));
 					report.save();
 					PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
-					patientInfos.setName(record.getStr("PATIENTNAME"));
-					patientInfos.setPhone(record.getStr("PHONE"));
-					patientInfos.setCardNum(record.getStr("IDCARD"));
+					patientInfos.setName(record.getStr("patientname"));
+					patientInfos.setPhone(record.getStr("phone"));
+					patientInfos.setCardNum(record.getStr("idcard"));
 					patientInfos.update();
 					exams2.setExamStatus(9);
 //					String patString = record.getStr("住院号");
@@ -73,9 +73,9 @@ public class DataTask implements ITask {
 //					patString = String.format("%0"+length+"d",Long.valueOf(patString));
 //					exams2.setHopitalizedNo(patString);
 //					exams2.setClinDoctors(record.getStr("CLINICALDOCTOR"));
-					exams2.setApplicationDepartment(record.getStr("DEPARTMENT"));
-					exams2.setApplicationDoctor(record.getStr("CLINICALDOCTOR"));
-//					exams2.setClinDiag(record.getStr("diagnosis"));
+					exams2.setApplicationDepartment(record.getStr("clinicaldoctor"));
+//					exams2.setApplicationDoctor(record.getStr("CLINICALDOCTOR"));
+					exams2.setClinDiag(record.getStr("diagnosis"));
 					exams2.update();
 					// 传云医康 数据
 					Map<String, String> data = new HashMap<String, String>();
@@ -85,18 +85,18 @@ public class DataTask implements ITask {
 					// 影像所见
 					data.put("description", record.getStr("description"));
 					// 意见建议
-					data.put("impression", record.getStr("IMPRESSION"));
+					data.put("impression", record.getStr("impression"));
 					// 检查id
 					data.put("exam_id", exams2.getId());
 					data.put("study_id", exams2.getStudyId());
 					// 患者id
 					data.put("patient_id", exams2.getPatientId());
 					// 患者姓名
-					data.put("patient_name", record.getStr("PATIENTNAME"));
+					data.put("patient_name", record.getStr("patientname"));
 					// 患者性别
 					data.put("patient_sex", patientInfos.getSex());
 					// 身份证号
-					data.put("card_num", record.getStr("IDCARD"));
+					data.put("card_num", record.getStr("idcard"));
 					// 手机号
 					data.put("phone", patientInfos.getPhone());
 					// 患者生日
@@ -106,30 +106,31 @@ public class DataTask implements ITask {
 					// 阴阳性 1阴性 2阳性
 					data.put("report_result", "");
 					// 报告时间 10位时间戳
-					data.put("report_datetime", returnSecondTimestamp(record.getStr("REPORTDATE")));
+					data.put("report_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 报告医生id
-					data.put("report_doctor_id", record.getStr("REPORTDOCTOR"));
+					data.put("report_doctor_id", record.getStr("reportdoctor"));
 					// 报告医生姓名
-					data.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+					data.put("report_doctor_name", record.getStr("reportdoctor"));
 					// 审核时间
-					data.put("review_datetime", returnSecondTimestamp(record.getStr("REPORTDATE")));
+					data.put("review_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 审核医生id
-					data.put("review_doctor_id", record.getStr("REVIEWDOCTOR"));
+					data.put("review_doctor_id", record.getStr("reviewdoctor"));
 					// 审核姓名
-					data.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
+					data.put("review_doctor_name", record.getStr("reviewdoctor"));
 					// 确认时间
-					data.put("confirm_datetime", returnSecondTimestamp(record.getStr("REPORTDATE")));
+					data.put("confirm_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 确认医生id
-					data.put("confirm_doctor_id", record.getStr("REVIEWDOCTOR"));
+					data.put("confirm_doctor_id", record.getStr("reviewdoctor"));
 					// 确认医生姓名
-					data.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
+					data.put("confirm_doctor_name", record.getStr("reviewdoctor"));
 					data.put("patient_no", "");
 
 
 					ThreadPoolService tService = new com.zskk.service.ThreadPoolService();
 					tService.execute(() -> {
 						String dadaString = JSON.toJSONString(data);
-						dadaString = dadaString.replace("\\r\\n", "");
+						dadaString = dadaString.replace("\\r", "");
+						dadaString = dadaString.replace("\\n", "");
 						dadaString = dadaString.replace("*", "X");
 						dadaString = dadaString.replace("<p>", "");
 						dadaString = dadaString.replace("<br/>", "");