|
|
@@ -5,10 +5,7 @@ import com.jfinal.kit.HashKit;
|
|
|
import com.jfinal.plugin.activerecord.Db;
|
|
|
import com.jfinal.plugin.activerecord.Record;
|
|
|
import com.jfinal.plugin.cron4j.ITask;
|
|
|
-import com.zskk.model.Doctors;
|
|
|
-import com.zskk.model.Exams;
|
|
|
-import com.zskk.model.PatientInfos;
|
|
|
-import com.zskk.model.Report;
|
|
|
+import com.zskk.model.*;
|
|
|
import okhttp3.*;
|
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
|
|
|
|
@@ -29,21 +26,21 @@ public class DataTask implements ITask {
|
|
|
"SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=25200005 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=?",
|
|
|
- exams2.getAccessionNum());
|
|
|
+ Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
|
|
|
+ Record record = Db.use("connected").findFirst("select * from zskk 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("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")));
|
|
|
@@ -58,7 +55,7 @@ public class DataTask implements ITask {
|
|
|
patientInfos.setCardNum(record.getStr("idcard"));
|
|
|
patientInfos.update();
|
|
|
exams2.setExamStatus(9);
|
|
|
- exams2.setClinDoctors(record.getStr("clinicaldoctor"));
|
|
|
+ //exams2.setClinDoctors(record.getStr("clinicaldoctor"));
|
|
|
exams2.setApplicationDepartment(record.getStr("department"));
|
|
|
exams2.setApplicationDoctor(record.getStr("clinicaldoctor"));
|
|
|
exams2.setClinDiag(record.getStr("diagnosis"));
|
zhangzhanping