commit

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

@@ -58,7 +58,7 @@ public class ViewController extends Controller {
         JSONArray jsonArray = dService.getReport(dateparams);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-		    String REPORT_ID = jsonObject.getString("REPORT_ID");
+		    String REPORT_ID = jsonObject.getString("REPORT_ID")==null?"":jsonObject.getString("REPORT_ID");
 		    			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()
@@ -92,7 +92,7 @@ public class ViewController extends Controller {
 //						.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='?'", REPORT_ID);
+		    Record record2 = Db.use("crb").findFirst("select * from DC_PACS_XML where REPORT_ID=?", REPORT_ID);
 			if (record2 == null) {
 //				Record DC_PACS_XML = new Record()
 //						.set("REPORT_ID", REPORT_ID)