|
|
@@ -25,17 +25,22 @@ public class DataTask implements ITask {
|
|
|
for (Exams exams2 : exams) {
|
|
|
Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
|
|
|
Record record = Db.use("connected").findFirst("select * from caller 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) {
|
|
|
+ if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
|
|
|
continue;
|
|
|
}
|
|
|
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");
|
|
|
+ if (record.getStr("FITEM_RESULT_CODE") != null) {
|
|
|
+ report.setReportResult(record.getStr("FITEM_RESULT_CODE").contains("阳")?"2":"1");
|
|
|
+ }
|
|
|
report.setReportDoctorId(getDoctorIdByName(record.getStr("REPORTDOCTOR")));
|
|
|
report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
|
|
|
report.setReviewDatetime(parseStringToDate(record.getStr("REPORTDATE")));
|
