commit

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

@@ -79,9 +79,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new SqlServerDialect());
 		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

@@ -9,6 +9,7 @@ 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;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.ThreadPoolService;
 import com.zskk.service.WeixinService;
@@ -35,11 +36,11 @@ public class DataTask implements ITask {
 		// TODO Auto-generated method stub
 		try {
 			List<Exams> exams = Exams.dao.use("zskk").find(
-					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='67500001' order by createdAt desc limit 50");
+					"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id='67500001' order by createdAt desc limit 30");
 			for (Exams exams2 : exams) {
 				try {
-					// Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-					Record record = Db.use("connected").findFirst("select * from zskk where accessionNumber=?",
+					 Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
+					Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",
 							exams2.getPatientNum());
 					if (record == null) {
 						continue;
@@ -47,31 +48,31 @@ public class DataTask implements ITask {
 					Report report = new Report().use("zskk");
 					report.setId(creatId());
 					report.setReportDatetime(parseStringToDate(record.getStr("reportdate")));
-					if (record.getStr("impression") == null || record.getStr("DESCRIPTION") == null
-							|| record.getStr("impression").isBlank() || record.getStr("DESCRIPTION").isBlank()) {
+					if (record.getStr("impression") == null || record.getStr("description") == null
+							|| record.getStr("impression").isBlank() || record.getStr("description").isBlank()) {
 						continue;
 					}
 					report.setImpression(record.getStr("impression"));
-					report.setDescription(record.getStr("DESCRIPTION"));
+					report.setDescription(record.getStr("description"));
 					report.setExamId(exams2.getId());
 					report.setCreatedAt(new Date());
 					report.setReportDoctorId(getDoctorIdByName(record.getStr("reportdoctor")));
-					report.setReviewDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
+					report.setReviewDoctorId(getDoctorIdByName(record.getStr("reportdoctor")));
 					report.setReviewDatetime(parseStringToDate(record.getStr("reportdate")));
-					report.setConfirmDoctorId(getDoctorIdByName(record.getStr("reviewdoctor")));
+					report.setConfirmDoctorId(getDoctorIdByName(record.getStr("reportdoctor")));
 					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.setCardNum(record.getStr("idcard"));
 					patientInfos.update();
 					exams2.setExamStatus(9);
-					String patString = record.getStr("patientid");
-					Integer length = patString.length();
-					patString = String.format("%0"+length+"d",Long.valueOf(patString));
-					exams2.setHopitalizedNo(patString);
-					exams2.setClinDoctors(record.getStr("clinicaldoctor"));
+//					String patString = record.getStr("patientid");
+//					Integer length = patString.length();
+//					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"));
@@ -82,7 +83,7 @@ public class DataTask implements ITask {
 					// 医院id
 					data.put("hospital_id", "67500001");
 					// 影像所见
-					data.put("description", record.getStr("DESCRIPTION"));
+					data.put("description", record.getStr("description"));
 					// 意见建议
 					data.put("impression", record.getStr("impression"));
 					// 检查id
@@ -113,16 +114,16 @@ public class DataTask implements ITask {
 					// 审核时间
 					data.put("review_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 审核医生id
-					data.put("review_doctor_id", record.getStr("reviewdoctor"));
+					data.put("review_doctor_id", record.getStr("reportdoctor"));
 					// 审核姓名
-					data.put("review_doctor_name", record.getStr("reviewdoctor"));
+					data.put("review_doctor_name", record.getStr("reportdoctor"));
 					// 确认时间
 					data.put("confirm_datetime", returnSecondTimestamp(record.getStr("reportdate")));
 					// 确认医生id
-					data.put("confirm_doctor_id", record.getStr("reviewdoctor"));
+					data.put("confirm_doctor_id", record.getStr("reportdoctor"));
 					// 确认医生姓名
-					data.put("confirm_doctor_name", record.getStr("reviewdoctor"));
-					data.put("patient_no", patString);
+					data.put("confirm_doctor_name", record.getStr("reportdoctor"));
+					data.put("patient_no", "");
 
 
 					ThreadPoolService tService = new com.zskk.service.ThreadPoolService();