commit

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

@@ -86,54 +86,60 @@ public class ViewController extends Controller {
 		
 		DataService dService = ServiceFactory.getService(DataService.class);
 
-		List<Record> records = Db.use("connected").find("select * from reportinfo where REVIEWDATE BETWEEN ? and ?",this.getPara("from"),this.getPara("to"));
+		List<Record> records = Db.use("connected").find("select * from reportinfo where UpDateTime BETWEEN ? and ?",this.getPara("from"),this.getPara("to"));
 		for (Record record : records) {
 			try {
 				Map<String, String> params = new HashMap<>();
 				// 1:exam_id 2:patient_num 3:accession_num 4:study_uid
-				params.put("type", "2");
+				params.put("type", "4");
 
 				params.put("institution_id", PropKit.get("institution_id"));
 
-				params.put("code", record.getStr("ACCESSIONNUMBER"));
+				params.put("code", record.getStr("StudyInsUid"));
 				//报告医生姓名
-				params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+				params.put("report_doctor_name", record.getStr("ReportDoctor"));
 				//报告时间
-				params.put("report_datetime", parseStringToDate(record.getStr("REPORTDATE")));
+				params.put("report_datetime",record.getStr("ReportDate"));
 				//审核医生姓名
-				params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+				params.put("review_doctor_name", record.getStr("ReviewDoctor")==null?"":record.getStr("ReviewDoctor"));
 				//审核时间
-				params.put("review_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
+				params.put("review_datetime", record.getStr("ReviewDate"));
 				//确认医生姓名
-				params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
+				params.put("confirm_doctor_name", record.getStr("ReviewDoctor")==null?"":record.getStr("ReviewDoctor"));
 				//确认时间
-				params.put("confirm_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
+				params.put("confirm_datetime", record.getStr("ReviewDate"));
 				//意见建议
-				params.put("impression", record.getStr("IMPRESSION"));
+				params.put("impression", record.getStr("Impression"));
 				//影像所见
-				params.put("description", record.getStr("DESCRIPTION"));
+				params.put("description", record.getStr("Description"));
 				//exams表
 				//申请科室
-				params.put("application_department", record.getStr("DEPARTMENT"));
+				params.put("application_department", record.getStr("ReqDept"));
 				//申请医生
-				params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+				params.put("application_doctor", record.getStr("ReqDoctor"));
 				//临床诊断
-				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("name", record.getStr("PatName"));
 				//患者手机号
-				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("card_num", record.getStr("IDCard")==null?"":record.getStr("IDCard"));
 				//检查结果1阴2阳
-//				params.put("report_result", record.getStr("RESULT").contains("阳")?"2":"1");
-				params.put("report_result", "");
+				params.put("report_result", record.getStr("Result").contains("阳")?"2":"1");
+//				params.put("report_result", "");
 
 				//住院号
-				params.put("hopitalized_no", "");
+				params.put("hopitalized_no", record.getStr("InPatientNum"));
+				//门诊号
+				params.put("out_patient", record.getStr("OutPatientNum"));
+				//病人ID
+//				params.put("his_patient_id", record.getStr("InPatientNum"));
+				//检查方法
+				params.put("exam_project", record.getStr("ExamItem"));
 				
 				dService.saveReport(params);
 			} catch (Exception e) {

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

@@ -24,12 +24,17 @@ public class PayTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-		List<Record> records = Db.use("connected").find("select * from paylist where ISFEE=1 order by PAYTIME desc");
+		List<Record> records = Db.use("connected").find("select top 10 * from examinfo order by ReqDate DESC");
 		for (Record record : records) {
+			if (!record.getStr("ExamItem").contains("无片")) {
+				continue;
+			}
 			JSONObject jsonObject = new JSONObject();
+			//机构ID
 			jsonObject.put("institution_id", PropKit.get("institution_id"));
-			jsonObject.put("patient_num", record.getStr("ACCESSIONNUMBER"));
-			jsonObject.put("ins_type", "2");
+			jsonObject.put("accession_num", record.getStr("AccessionNumber"));
+			//机构类型：1：accnum2：patnum
+			jsonObject.put("ins_type", "1");
 			JSONObject pJsonObject = new JSONObject();
 			pJsonObject.put("params", jsonObject.toJSONString());
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);