commit

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

@@ -18,6 +18,7 @@ import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
+import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -75,6 +76,10 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
+		
+		Cron4jPlugin upData = new Cron4jPlugin();
+		upData.addTask("*/1 * * * *", new UpdateTask());
+		me.add(upData);
 	}
 
 	@Override

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

@@ -67,7 +67,7 @@ public class DataTask implements ITask {
 			params.put("clin_symp", record.getStr("symptom")==null?"":record.getStr("symptom"));
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
+			params.put("name", record.getStr("patientname"));
 			//患者手机号
 			params.put("phone", record.getStr("phone")==null?"":record.getStr("phone"));
 			//患者身份证号

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

@@ -20,11 +20,11 @@ public class UpdateTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(30);
+        JSONArray jsonArray = dService.getExamList(10);
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from examinfo where studyuid=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from examinfo where examNo=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
@@ -32,22 +32,30 @@ public class UpdateTask implements ITask {
 			params.put("exam_id", jsonObject.getString("id"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("department") == null ? "" : record.getStr("department"));
+			params.put("application_department", record.getStr("department"));
 			//申请医生
-			params.put("application_doctor", record.getStr("clinicaldoctor") == null ? "" : record.getStr("clinicaldoctor"));
+			params.put("application_doctor", record.getStr("clinicaldoctor"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
+			params.put("clin_diag", record.getStr("diagnosis")==null?"":record.getStr("diagnosis"));
 			//症状
-			params.put("clin_symp", record.getStr("symptom") == null ? "" : record.getStr("symptom"));
+			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("phone", record.getStr("phone")==null?"":record.getStr("phone"));
 			//患者身份证号
-			params.put("card_num", record.getStr("idcard") == null ? "" : record.getStr("idcard"));
-			//门诊号住院号
-			params.put("hopitalized_no", "");
+			params.put("card_num", record.getStr("idcard")==null?"":record.getStr("idcard"));
+			//检查结果1阴2阳
+			params.put("report_result", "0");
+			//住院号
+			params.put("hopitalized_no", record.getStr("inPatientNum"));
+			//门诊号
+			params.put("out_patient", record.getStr("outPatientNum"));
+			//病人ID
+			params.put("his_patient_id", record.getStr("patientid"));
+			//检查方法
+			params.put("exam_project", record.getStr("project"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.updatePatientInfo(params);