commit

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

@@ -56,8 +56,9 @@ public class ViewController extends Controller {
 		Map<String, String> dateparams = new HashMap<>();
 		dateparams.put("datetime", parseStringToDate());
         JSONArray jsonArray = dService.getReport(dateparams);	
-//        for (Object object : jsonArray) {
-//			JSONObject jsonObject = JSON.parseObject(object.toString());
+        for (Object object : jsonArray) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			 this.renderJson(jsonObject);
 //			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()
@@ -90,7 +91,7 @@ public class ViewController extends Controller {
 //						.set("UPDATE_TIME", jsonObject.getString("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()
@@ -105,7 +106,7 @@ public class ViewController extends Controller {
 //				}
 //        	
 //        }
-        this.renderJson(jsonArray);
+//        this.renderJson(jsonArray);
 		} catch (Exception e) {
 			// TODO: handle exception
     		this.renderText(e.toString());