commit

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

@@ -15,6 +15,9 @@ 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 okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -72,9 +75,68 @@ public class ViewController extends Controller {
 	}
 	
 	public void st() {
+		try {
+			
 		
-			this.renderText(new Date().toString());
-	
+		DataService dService = ServiceFactory.getService(DataService.class);
+
+		Record record = Db.use("connected").findFirst("select * from reportcheck where studyuid='1.2.840.113704.1.111.10496.1646103697.1'");
+
+		Map<String, String> params = new HashMap<>();
+		// 1:exam_id 2:patient_num 3:accession_num 4:study_uid
+		params.put("type", "4");
+
+		params.put("institution_id", PropKit.get("institution_id"));
+
+		params.put("code", record.getStr("studyuid"));
+		// 报告医生姓名
+		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("reportdate"));
+		// 确认医生姓名
+		params.put("confirm_doctor_name",
+				record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+		// 确认时间
+		params.put("confirm_datetime", record.getStr("reportdate"));
+		// 意见建议
+		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"));
+		// patient_infos表
+		// 患者姓名
+		params.put("name", record.getStr("patientname"));
+		// 患者手机号
+		params.put("phone", record.getStr("phone"));
+		// 患者身份证号
+		params.put("card_num", record.getStr("idcard"));
+		// 检查结果1阴2阳
+		params.put("report_result", "0");
+		// 门诊号住院号
+		params.put("hopitalized_no", "");
+		
+		String x =dService.saveReport(params);
+		renderText(x);
+
+		
+		} catch (Exception e) {
+			// TODO: handle exception
+			renderText(e.toString());
+		}
+
 	}
 	
 	public static DruidPlugin createConnectedDruidPlugin() {

DataFusion/src/com/zskk/service/DataService.java

@@ -65,8 +65,9 @@ public class DataService {
      * @param instutionId
      * @param number
      */
-    public void saveReport(Map <String,String> map) {
-		postWithParameters(SAVE_REPORT_URL, map);
+    public String saveReport(Map <String,String> map) {
+    	String content = postWithParameters(SAVE_REPORT_URL, map);
+		return content;
 		
 	}
     

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

@@ -30,7 +30,7 @@ public class CheckTask implements ITask {
 				if (record == null) {
 					continue;
 				}
-				if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
+				if (record.getStr("impression").isBlank() || record.getStr("description").isBlank()) {
 					continue;
 				}
 				Map<String, String> params = new HashMap<>();