commit

DataFusion/src/com/zskk/control/ViewController.java

@@ -9,6 +9,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -22,6 +23,7 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
+import com.zskk.service.DataService;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.ThreadPoolService;
 import com.zskk.tools.ExecUtil;
@@ -192,6 +194,91 @@ public class ViewController extends Controller {
 			this.renderText(fileName2String);
 
 	}
+	
+	public void sdreview() {
+		try {
+			DataService dService = ServiceFactory.getService(DataService.class);
+			  
+			List<Record> records = Db.use("connected").find(
+					"select * from reportinfo where reviewdate >? and reviewdate <? order by reviewdate desc",this.getPara("from"),this.getPara("to"));
+			if (records == null) {
+				return;
+			}
+			for (Record record : records) {
+				try {
+					
+					if (record.getStr("description") == null && record.getStr("impression") == null) {
+						continue;
+					}
+					Map<String, String> params = new HashMap<>();
+					//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+					params.put("type", "2");
+					
+					params.put("institution_id", PropKit.get("institution_id"));
+
+					params.put("code", record.getStr("examNo"));
+					// 报告医生姓名
+					params.put("report_doctor_name", record.getStr("reportdoctor"));
+					// 报告时间
+					params.put("report_datetime", record.getStr("reportdate"));
+					// 审核医生姓名
+					params.put("review_doctor_name",
+							record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+					// 审核时间
+					params.put("review_datetime", record.getStr("reviewdate"));
+					// 确认医生姓名
+					params.put("confirm_doctor_name",
+							record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+					// 确认时间
+					params.put("confirm_datetime", record.getStr("reviewdate"));
+					// 意见建议
+					params.put("impression", record.getStr("impression"));
+					// 影像所见
+					params.put("description", record.getStr("description"));
+					// exams表
+					// 申请科室
+					params.put("application_department", record.getStr("department"));
+					// 申请医生
+					params.put("application_doctor", record.getStr("clinicaldoctor"));
+					// 临床诊断
+					params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
+					// 症状
+					params.put("clin_symp", record.getStr("symptom") == null ? "" : record.getStr("symptom"));
+					// patient_infos表
+					// 患者姓名
+					params.put("name", record.getStr("patientname"));
+					// 患者手机号
+					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("hopitalized_no", record.getStr("inPatientNum") == null ? "" : record.getStr("inPatientNum"));
+					// 门诊号
+					params.put("out_patient", record.getStr("outPatientNum") == null ? "" : record.getStr("outPatientNum"));
+					// 病人ID
+					params.put("his_patient_id", record.getStr("patientid") == null ? "" : record.getStr("patientid"));
+					// 检查方法
+					params.put("exam_project", record.getStr("project"));
+					ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+					tService.execute(() -> {
+						dService.saveReport(params);
+					});
+				} catch (Exception e) {
+					// TODO: handle exception
+					continue;
+				}
+			}
+			this.renderJson(records);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+
+		}
+		
+	}
+	
 	public static DruidPlugin createConnectedDruidPlugin() {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());

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

@@ -22,7 +22,7 @@ public class ReviewTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-		List<Record> records = Db.use("connected").find("select top 50 * from reportinfo where reviewdate >? order by reviewdate desc",parseStringToDate());
+		List<Record> records = Db.use("connected").find("select top 80 * from reportinfo where reviewdate >? order by reviewdate desc",parseStringToDate());
 		for (Record record : records) {
 			try {