commit

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

@@ -39,6 +39,8 @@ public class DataTask implements ITask {
 				String reportdocString = "";
 				//审核医生
 				String reviewdocString = "";
+				//检查号（his_patient_id）
+				String hispatientidStr = "";
 				if (record_accnum.size() == 1) {
 					record = record_accnum.get(0);
 					desString = desString + record.getStr("description");
@@ -46,18 +48,31 @@ public class DataTask implements ITask {
 					proString = proString + record.getStr("project");
 					reportdocString = reportdocString + record.getStr("reportdoctor");
 					reviewdocString = reviewdocString + record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor");
+					hispatientidStr = hispatientidStr + record.getStr("examNo");
 				}else if (record_accnum.size() > 1) {
 					record = record_accnum.get(0);
 					for (Record countRecord : record_accnum) {
-						desString = desString + countRecord.getStr("description") + "\n\n";
-						impString = impString + countRecord.getStr("impression") + "\n\n";
-						proString = proString + countRecord.getStr("project") + ";";
+						if (!desString.contains(countRecord.getStr("description"))) {
+							desString = desString + countRecord.getStr("description") + "\n";
+						}
+						if (!impString.contains(countRecord.getStr("impression"))) {
+							impString = impString + countRecord.getStr("impression") + "\n";
+						}
+						if (!proString.contains(countRecord.getStr("project"))) {
+							proString = proString + countRecord.getStr("project") + "；";
+						}
+//						desString = desString + countRecord.getStr("description") + "\n\n";
+//						impString = impString + countRecord.getStr("impression") + "\n\n";
+//						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") + " ";
 						}
+						if (!hispatientidStr.contains(countRecord.getStr("examNo"))) {
+							hispatientidStr = hispatientidStr + countRecord.getStr("examNo") + "；";
+						}
 					}
 				}else {
 					continue;
@@ -130,7 +145,7 @@ public class DataTask implements ITask {
 				// 门诊号
 				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("his_patient_id", hispatientidStr);
 				// 检查方法
 				params.put("exam_project", proString);
 				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);

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

@@ -38,6 +38,8 @@ public class ReviewTask implements ITask {
 				String reportdocString = "";
 				//审核医生
 				String reviewdocString = "";
+				//检查号（his_patient_id）
+				String hispatientidStr = "";
 				if (record_accnum.size() == 1) {
 					record = record_accnum.get(0);
 					desString = desString + record.getStr("description");
@@ -45,18 +47,31 @@ public class ReviewTask implements ITask {
 					proString = proString + record.getStr("project");
 					reportdocString = reportdocString + record.getStr("reportdoctor");
 					reviewdocString = reviewdocString + record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor");
+					hispatientidStr = hispatientidStr + record.getStr("examNo");
 				}else if (record_accnum.size() > 1) {
 					record = record_accnum.get(0);
 					for (Record countRecord : record_accnum) {
-						desString = desString + countRecord.getStr("description") + "\n\n";
-						impString = impString + countRecord.getStr("impression") + "\n\n";
-						proString = proString + countRecord.getStr("project") + ";";
+						if (!desString.contains(countRecord.getStr("description"))) {
+							desString = desString + countRecord.getStr("description") + "\n";
+						}
+						if (!impString.contains(countRecord.getStr("impression"))) {
+							impString = impString + countRecord.getStr("impression") + "\n";
+						}
+						if (!proString.contains(countRecord.getStr("project"))) {
+							proString = proString + countRecord.getStr("project") + "；";
+						}
+//						desString = desString + countRecord.getStr("description") + "\n\n";
+//						impString = impString + countRecord.getStr("impression") + "\n\n";
+//						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") + " ";
 						}
+						if (!hispatientidStr.contains(countRecord.getStr("examNo"))) {
+							hispatientidStr = hispatientidStr + countRecord.getStr("examNo") + "；";
+						}
 					}
 				}else {
 					continue;
@@ -130,7 +145,7 @@ public class ReviewTask implements ITask {
 				// 门诊号
 				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("his_patient_id", hispatientidStr);
 				// 检查方法
 				params.put("exam_project", proString);
 				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
@@ -149,8 +164,61 @@ public class ReviewTask implements ITask {
 		List<Record> recordstj = Db.use("connected").find("select * from reportinfo where reviewdate >? and reviewdate <? and department='健康体检科' order by reviewdate desc",parseStringToDatetje(),parseStringToDatetjs());
 		for (Record record : recordstj) {
 			try {
+				List<Record> record_accnum = Db.use("connected").find("select * from reportinfo where accessionNumber=?",
+						record.getStr("accessionNumber"));
+//				Record record = null;
+				//所见
+				String desString = "";
+				//建议
+				String impString = "";
+				//项目
+				String proString = "";
+				//报告医生
+				String reportdocString = "";
+				//审核医生
+				String reviewdocString = "";
+				//检查号（his_patient_id）
+				String hispatientidStr = "";
+				if (record_accnum.size() == 1) {
+					record = record_accnum.get(0);
+					desString = desString + record.getStr("description");
+					impString = impString + record.getStr("impression");
+					proString = proString + record.getStr("project");
+					reportdocString = reportdocString + record.getStr("reportdoctor");
+					reviewdocString = reviewdocString + record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor");
+					hispatientidStr = hispatientidStr + record.getStr("examNo");
+				}else if (record_accnum.size() > 1) {
+					record = record_accnum.get(0);
+					for (Record countRecord : record_accnum) {
+						if (!desString.contains(countRecord.getStr("description"))) {
+							desString = desString + countRecord.getStr("description") + "\n";
+						}
+						if (!impString.contains(countRecord.getStr("impression"))) {
+							impString = impString + countRecord.getStr("impression") + "\n";
+						}
+						if (!proString.contains(countRecord.getStr("project"))) {
+							proString = proString + countRecord.getStr("project") + "；";
+						}
+//						desString = desString + countRecord.getStr("description") + "\n\n";
+//						impString = impString + countRecord.getStr("impression") + "\n\n";
+//						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") + " ";
+						}
+						if (!hispatientidStr.contains(countRecord.getStr("examNo"))) {
+							hispatientidStr = hispatientidStr + countRecord.getStr("examNo") + "；";
+						}
+					}
+				}else {
+					continue;
+				}
+//				Record record = Db.use("connected").findFirst("select * from reportinfo where examNo=?",
+//						jsonObject.getString("patient_num"));
 				
-				if (record.getStr("description") == null && record.getStr("impression") == null) {
+				if (desString == "" && impString == "") {
 					continue;
 				}
 				if (record.getStr("department").equals("健康体检科")) {
@@ -217,7 +285,7 @@ public class ReviewTask implements ITask {
 				// 门诊号
 				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("his_patient_id", hispatientidStr);
 				// 检查方法
 				params.put("exam_project", record.getStr("project"));
 				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);