Browse Source

更新医生

LAPTOP-5NTQJPUS\LT 1 year ago
parent
commit
89230e376f

+ 8 - 4
DataFusion/src/com/zskk/service/DataService.java

@@ -103,10 +103,14 @@ public class DataService {
 	}
 	}
     
     
     public static void main(String[] args) {
     public static void main(String[] args) {
-    	List<Record> count = null;
-		//同时下载的队列
-		Integer flag = count.size();
-		System.out.print(flag);
+//    	List<Record> count = null;
+//		//同时下载的队列
+//		Integer flag = count.size();
+//		System.out.print(flag);
+    	String aaaString = "abc def";
+    	if (aaaString != null && !aaaString.contains("abc")) {
+    		System.out.print("su");
+		}
 	}
 	}
 
 
 }
 }

+ 14 - 4
DataFusion/src/com/zskk/task/DataTask.java

@@ -35,17 +35,29 @@ public class DataTask implements ITask {
 				String impString = "";
 				String impString = "";
 				//项目
 				//项目
 				String proString = "";
 				String proString = "";
+				//报告医生
+				String reportdocString = "";
+				//审核医生
+				String reviewdocString = "";
 				if (record_accnum.size() == 1) {
 				if (record_accnum.size() == 1) {
 					record = record_accnum.get(0);
 					record = record_accnum.get(0);
 					desString = desString + record.getStr("description");
 					desString = desString + record.getStr("description");
 					impString = impString + record.getStr("impression");
 					impString = impString + record.getStr("impression");
 					proString = proString + record.getStr("project");
 					proString = proString + record.getStr("project");
+					reportdocString = reportdocString + record.getStr("reportdoctor");
+					reviewdocString = reviewdocString + record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor");
 				}else if (record_accnum.size() > 1) {
 				}else if (record_accnum.size() > 1) {
 					record = record_accnum.get(0);
 					record = record_accnum.get(0);
 					for (Record countRecord : record_accnum) {
 					for (Record countRecord : record_accnum) {
 						desString = desString + countRecord.getStr("description") + "\n\n";
 						desString = desString + countRecord.getStr("description") + "\n\n";
 						impString = impString + countRecord.getStr("impression") + "\n\n";
 						impString = impString + countRecord.getStr("impression") + "\n\n";
 						proString = proString + countRecord.getStr("project") + ";";
 						proString = proString + countRecord.getStr("project") + ";";
+						if (!reportdocString.contains(countRecord.getStr("reportdoctor"))) {
+							reportdocString = reportdocString + countRecord.getStr("reportdoctor") + " ";
+						}
+						if (countRecord.getStr("reviewdoctor") != null && !reviewdocString.contains(countRecord.getStr("reviewdoctor"))) {
+							reviewdocString = reviewdocString + countRecord.getStr("reviewdoctor") + " ";
+						}
 					}
 					}
 				}else {
 				}else {
 					continue;
 					continue;
@@ -80,13 +92,11 @@ public class DataTask implements ITask {
 				// 报告时间
 				// 报告时间
 				params.put("report_datetime", 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", reviewdocString);
 				// 审核时间
 				// 审核时间
 				params.put("review_datetime", 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", reviewdocString);
 				// 确认时间
 				// 确认时间
 				params.put("confirm_datetime", record.getStr("reviewdate"));
 				params.put("confirm_datetime", record.getStr("reviewdate"));
 				// 意见建议
 				// 意见建议

+ 15 - 5
DataFusion/src/com/zskk/task/ReviewTask.java

@@ -34,17 +34,29 @@ public class ReviewTask implements ITask {
 				String impString = "";
 				String impString = "";
 				//项目
 				//项目
 				String proString = "";
 				String proString = "";
+				//报告医生
+				String reportdocString = "";
+				//审核医生
+				String reviewdocString = "";
 				if (record_accnum.size() == 1) {
 				if (record_accnum.size() == 1) {
 					record = record_accnum.get(0);
 					record = record_accnum.get(0);
 					desString = desString + record.getStr("description");
 					desString = desString + record.getStr("description");
 					impString = impString + record.getStr("impression");
 					impString = impString + record.getStr("impression");
 					proString = proString + record.getStr("project");
 					proString = proString + record.getStr("project");
+					reportdocString = reportdocString + record.getStr("reportdoctor");
+					reviewdocString = reviewdocString + record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor");
 				}else if (record_accnum.size() > 1) {
 				}else if (record_accnum.size() > 1) {
 					record = record_accnum.get(0);
 					record = record_accnum.get(0);
 					for (Record countRecord : record_accnum) {
 					for (Record countRecord : record_accnum) {
 						desString = desString + countRecord.getStr("description") + "\n\n";
 						desString = desString + countRecord.getStr("description") + "\n\n";
 						impString = impString + countRecord.getStr("impression") + "\n\n";
 						impString = impString + countRecord.getStr("impression") + "\n\n";
 						proString = proString + countRecord.getStr("project") + ";";
 						proString = proString + countRecord.getStr("project") + ";";
+						if (!reportdocString.contains(countRecord.getStr("reportdoctor"))) {
+							reportdocString = reportdocString + countRecord.getStr("reportdoctor") + " ";
+						}
+						if (countRecord.getStr("reviewdoctor") != null && !reviewdocString.contains(countRecord.getStr("reviewdoctor"))) {
+							reviewdocString = reviewdocString + countRecord.getStr("reviewdoctor") + " ";
+						}
 					}
 					}
 				}else {
 				}else {
 					continue;
 					continue;
@@ -76,17 +88,15 @@ public class ReviewTask implements ITask {
 
 
 				params.put("code", record.getStr("examNo"));
 				params.put("code", record.getStr("examNo"));
 				// 报告医生姓名
 				// 报告医生姓名
-				params.put("report_doctor_name", record.getStr("reportdoctor"));
+				params.put("report_doctor_name", reportdocString);
 				// 报告时间
 				// 报告时间
 				params.put("report_datetime", 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", reviewdocString);
 				// 审核时间
 				// 审核时间
 				params.put("review_datetime", 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", reviewdocString);
 				// 确认时间
 				// 确认时间
 				params.put("confirm_datetime", record.getStr("reviewdate"));
 				params.put("confirm_datetime", record.getStr("reviewdate"));
 				// 意见建议
 				// 意见建议