|
|
@@ -58,7 +58,6 @@ 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()
|
|
|
@@ -71,15 +70,15 @@ public class ViewController extends Controller {
|
|
|
.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"))
|
|
|
+ .set("TEL", jsonObject.getString("TEL")==null?"":jsonObject.getString("TEL"))
|
|
|
.set("ORG_CODE", "371728007")
|
|
|
.set("ORG_NAME", "东明县第二人民医院")
|
|
|
- .set("DEP_NAME", jsonObject.getString("DEP_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"))
|
|
|
+ .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"))
|
|
|
+ .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"))
|
|
|
@@ -91,7 +90,7 @@ public class ViewController extends Controller {
|
|
|
.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()
|
