commit

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

@@ -58,53 +58,53 @@ public class ViewController extends Controller {
         JSONArray jsonArray = dService.getReport(dateparams);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("crb").findFirst("select * from DC_PACS_REPORT where ID=?", jsonObject.getString("ID"));
-			if (record == null) {
-				Record DC_PACS_REPORT = new Record()
-						.set("ID", jsonObject.getString("ID"))
-						.set("REPORT_ID", jsonObject.getString("REPORT_ID"))
-						.set("PAT_FROM_TYPE", "门诊")
-						.set("PAT_NUM", jsonObject.getString("PAT_NUM")==null?"":jsonObject.getString("PAT_NUM"))
-						.set("TESTLIST", jsonObject.getString("TESTLIST")==null?"":jsonObject.getString("TESTLIST"))
-						.set("NAME", jsonObject.getString("NAME"))
-						.set("SEX",jsonObject.getString("SEX").contains("M")?"男":"女")
-						.set("BIRTHDAY", jsonObject.getDate("BIRTHDAY")==null?"":jsonObject.getDate("BIRTHDAY"))
-						.set("ADDRESS", jsonObject.getString("ADDRESS"))
-						.set("TEL", jsonObject.getString("TEL")==null?"":jsonObject.getString("TEL"))
-						.set("ORG_CODE", "371728007")
-						.set("ORG_NAME", "东明县第二人民医院")
-						.set("DEP_NAME", jsonObject.getString("DEP_NAME")==null?"":jsonObject.getString("DEP_NAME"))
-						.set("DEP_CODE", jsonObject.getString("DEP_CODE"))
-						.set("DUTY_DOCTOR_NAME", jsonObject.getString("DUTY_DOCTOR_NAME")==null?"":jsonObject.getString("DUTY_DOCTOR_NAME"))
-						.set("DUTY_DOCTOR_ID", jsonObject.getString("DUTY_DOCTOR_ID"))
-						.set("CHIEF_COMPLAINT", jsonObject.getString("CHIEF_COMPLAINT"))
-						.set("DIAGNOSIS", jsonObject.getString("DIAGNOSIS")==null?"":jsonObject.getString("DIAGNOSIS"))
-						.set("STUDY_BODYPART", jsonObject.getString("STUDY_BODYPART"))
-						.set("IMAGE_TYPE_NAME", jsonObject.getString("IMAGE_TYPE_NAME"))
-						.set("FINDING", jsonObject.getString("FINDING"))
-						.set("CONCLUSION", jsonObject.getString("CONCLUSION"))
-						.set("FLAG_DIAGNOSTIC_ACCORDANCE", "1")
-						.set("HAPPEN_TIME", jsonObject.getDate("HAPPEN_TIME"))
-						.set("SYSTEMTIME", jsonObject.getDate("SYSTEMTIME"))
-						.set("HOSPITAL_CODE", "371728007")
-						.set("UPDATE_TIME", jsonObject.getDate("UPDATE_TIME"))
-						.set("STATE", "0");
-				Db.use("crb").save("DC_PACS_REPORT", DC_PACS_REPORT);
-			}
-//			Record record2 = Db.use("crb").findFirst("select * from DC_PACS_XML where REPORT_ID=?", jsonObject.getString("REPORT_ID"));
-//			if (record2 == null) {
-//				Record DC_PACS_XML = new Record()
+//			Record record = Db.use("crb").findFirst("select * from DC_PACS_REPORT where ID=?", jsonObject.getString("ID"));
+//			if (record == null) {
+//				Record DC_PACS_REPORT = new Record()
+//						.set("ID", jsonObject.getString("ID"))
 //						.set("REPORT_ID", jsonObject.getString("REPORT_ID"))
 //						.set("PAT_FROM_TYPE", "门诊")
 //						.set("PAT_NUM", jsonObject.getString("PAT_NUM")==null?"":jsonObject.getString("PAT_NUM"))
+//						.set("TESTLIST", jsonObject.getString("TESTLIST")==null?"":jsonObject.getString("TESTLIST"))
+//						.set("NAME", jsonObject.getString("NAME"))
+//						.set("SEX",jsonObject.getString("SEX").contains("M")?"男":"女")
+//						.set("BIRTHDAY", jsonObject.getDate("BIRTHDAY")==null?"":jsonObject.getDate("BIRTHDAY"))
+//						.set("ADDRESS", jsonObject.getString("ADDRESS"))
+//						.set("TEL", jsonObject.getString("TEL")==null?"":jsonObject.getString("TEL"))
 //						.set("ORG_CODE", "371728007")
 //						.set("ORG_NAME", "东明县第二人民医院")
-//						.set("REPORT_XML", jsonObject.getString("FINDING")+jsonObject.getString("CONCLUSION"))
-//						.set("SYSTEMTIME", jsonObject.getDate("SYSTEMTIME"));
-//				Db.use("crb").save("DC_PACS_XML", DC_PACS_XML);
-//				this.renderJson(DC_PACS_XML);
-//
-//				}
+//						.set("DEP_NAME", jsonObject.getString("DEP_NAME")==null?"":jsonObject.getString("DEP_NAME"))
+//						.set("DEP_CODE", jsonObject.getString("DEP_CODE"))
+//						.set("DUTY_DOCTOR_NAME", jsonObject.getString("DUTY_DOCTOR_NAME")==null?"":jsonObject.getString("DUTY_DOCTOR_NAME"))
+//						.set("DUTY_DOCTOR_ID", jsonObject.getString("DUTY_DOCTOR_ID"))
+//						.set("CHIEF_COMPLAINT", jsonObject.getString("CHIEF_COMPLAINT"))
+//						.set("DIAGNOSIS", jsonObject.getString("DIAGNOSIS")==null?"":jsonObject.getString("DIAGNOSIS"))
+//						.set("STUDY_BODYPART", jsonObject.getString("STUDY_BODYPART"))
+//						.set("IMAGE_TYPE_NAME", jsonObject.getString("IMAGE_TYPE_NAME"))
+//						.set("FINDING", jsonObject.getString("FINDING"))
+//						.set("CONCLUSION", jsonObject.getString("CONCLUSION"))
+//						.set("FLAG_DIAGNOSTIC_ACCORDANCE", "1")
+//						.set("HAPPEN_TIME", jsonObject.getDate("HAPPEN_TIME"))
+//						.set("SYSTEMTIME", jsonObject.getDate("SYSTEMTIME"))
+//						.set("HOSPITAL_CODE", "371728007")
+//						.set("UPDATE_TIME", jsonObject.getDate("UPDATE_TIME"))
+//						.set("STATE", "0");
+//				Db.use("crb").save("DC_PACS_REPORT", DC_PACS_REPORT);
+//			}
+			Record record2 = Db.use("crb").findFirst("select * from DC_PACS_XML where REPORT_ID=?", jsonObject.getString("REPORT_ID"));
+			if (record2 == null) {
+				Record DC_PACS_XML = new Record()
+						.set("REPORT_ID", jsonObject.getString("REPORT_ID"))
+						.set("PAT_FROM_TYPE", "门诊")
+						.set("PAT_NUM", jsonObject.getString("PAT_NUM")==null?"":jsonObject.getString("PAT_NUM"))
+						.set("ORG_CODE", "371728007")
+						.set("ORG_NAME", "东明县第二人民医院")
+						.set("REPORT_XML", jsonObject.getString("FINDING")+jsonObject.getString("CONCLUSION"))
+						.set("SYSTEMTIME", jsonObject.getDate("SYSTEMTIME"));
+				Db.use("crb").save("DC_PACS_XML", DC_PACS_XML);
+				this.renderJson(DC_PACS_XML);
+
+				}
         	
         }