Index: ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service/gzzyyfy/WebServiceClientHelper.java
===================================================================
diff -u -r30025 -r40945
--- ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service/gzzyyfy/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 30025)
+++ ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/service/gzzyyfy/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 40945)
@@ -70,8 +70,8 @@
//xml转json
JSONObject resultJson = (JSONObject)CssdUtils.xml2JsonCommon(resultXml);
logger.debug("xml转成JSONObject:" + resultJson);
- String resultCode = resultJson.optString("ResultCode");//
- String resultMsg = resultJson.optString("ResultMsg");//
+ String resultCode = CssdUtils.optString(resultJson, "ResultCode");//
+ String resultMsg = CssdUtils.optString(resultJson, "ResultMsg");//
if(resultCode.equals("0")){//返回结果是否成功
//获得的解密数据
JSONArray dataTable = resultJson.optJSONArray("DataTable");
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SycnDataFromHIPDaoImpl.java
===================================================================
diff -u -r38902 -r40945
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SycnDataFromHIPDaoImpl.java (.../SycnDataFromHIPDaoImpl.java) (revision 38902)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SycnDataFromHIPDaoImpl.java (.../SycnDataFromHIPDaoImpl.java) (revision 40945)
@@ -316,7 +316,7 @@
JSONObject json = (JSONObject)CssdUtils.xml2JsonCommon(xmlResult);
JSONObject xmlResultJson = json.optJSONObject("soapenv:Body").optJSONObject("urn:HIPMessageServerResponse").optJSONObject("urn:payload").optJSONObject("QUMT_IN020040UV01");
- String acknowledgement = xmlResultJson.optJSONObject("sender").optJSONObject("acknowledgement").optString("@typeCode");
+ String acknowledgement = CssdUtils.optString(xmlResultJson.optJSONObject("sender").optJSONObject("acknowledgement"), "@typeCode");
logger.info("acknowledgement : " + acknowledgement);
if (!StringUtils.equals("AA", acknowledgement)) {
logger.info("手术申请单查询失败!acknowledgement = " + acknowledgement);
@@ -328,15 +328,15 @@
JSONObject patient = componentOf1.optJSONObject("encounter").optJSONObject("subject").optJSONObject("patient");
// 患者基本信息
if (patient != null) {
- String tNumber = patient.optJSONObject("id").optJSONArray("item").optJSONObject(0).optString("@extension");
+ String tNumber = CssdUtils.optString(patient.optJSONObject("id").optJSONArray("item").optJSONObject(0), "@extension");
logger.info("tNumber : " + tNumber);
- String patientName = patient.optJSONObject("patientPerson").optJSONObject("name").optJSONObject("item").optJSONObject("part").optString("@value");
+ String patientName = CssdUtils.optString(patient.optJSONObject("patientPerson").optJSONObject("name").optJSONObject("item").optJSONObject("part"), "@value");
logger.info("patientName : " + patientName);
- String patientAge = patient.optJSONObject("patientPerson").optJSONObject("birthTime").optJSONObject("originalText").optString("@value");
+ String patientAge = CssdUtils.optString(patient.optJSONObject("patientPerson").optJSONObject("birthTime").optJSONObject("originalText"), "@value");
logger.info("patientAge : " + patientAge);
- String patientSex = patient.optJSONObject("patientPerson").optJSONObject("administrativeGenderCode").optJSONObject("displayName").optString("@value");
+ String patientSex = CssdUtils.optString(patient.optJSONObject("patientPerson").optJSONObject("administrativeGenderCode").optJSONObject("displayName"), "@value");
logger.info("patientSex : " + patientSex);
- String patientIDCard = patient.optJSONObject("patientPerson").optJSONObject("id").optJSONArray("item").optJSONObject(0).optString("@extension");
+ String patientIDCard = CssdUtils.optString(patient.optJSONObject("patientPerson").optJSONObject("id").optJSONArray("item").optJSONObject(0), "@extension");
logger.info("patientIDCard : " + patientIDCard);
vo.setPatientNumber(tNumber);
vo.setPatientName(patientName);
@@ -356,9 +356,9 @@
procedureRequest2 = component2.optJSONObject(0).optJSONObject("procedureRequest");
// 手术信息
if (procedureRequest2 != null) {
- String doctorName = procedureRequest2.optJSONObject("performer").optJSONObject("assignedEntity").optJSONObject("assignedPerson").optJSONObject("name").optJSONObject("item").optJSONArray("part").optJSONObject(0).optString("@value");
+ String doctorName = CssdUtils.optString(procedureRequest2.optJSONObject("performer").optJSONObject("assignedEntity").optJSONObject("assignedPerson").optJSONObject("name").optJSONObject("item").optJSONArray("part").optJSONObject(0), "@value");
logger.info("doctorName : " + doctorName);
- String operation = procedureRequest2.optJSONObject("code").optJSONObject("displayName").optString("@value");
+ String operation = CssdUtils.optString(procedureRequest2.optJSONObject("code").optJSONObject("displayName"), "@value");
logger.info("operation : " + operation);
vo.setDoctorName(doctorName);
vo.setOperation(operation);
@@ -367,19 +367,19 @@
JSONObject serviceDeliveryLocation = componentOf1.optJSONObject("encounter").optJSONObject("location").optJSONObject("serviceDeliveryLocation");
// 住院信息
if (serviceDeliveryLocation != null) {
- String patientArea = serviceDeliveryLocation.optJSONObject("serviceProviderOrganization").optJSONObject("asOrganizationPartOf").optJSONObject("wholeOrganization").optJSONObject("name").optJSONObject("item").optJSONObject("part").optString("@value");
+ String patientArea = CssdUtils.optString(serviceDeliveryLocation.optJSONObject("serviceProviderOrganization").optJSONObject("asOrganizationPartOf").optJSONObject("wholeOrganization").optJSONObject("name").optJSONObject("item").optJSONObject("part"), "@value");
logger.info("patientArea : " + patientArea);
String opRoomId = null;
- String bedNumber = serviceDeliveryLocation.optJSONObject("location").optJSONObject("name").optJSONObject("item").optJSONObject("part").optString("@value");
+ String bedNumber = CssdUtils.optString(serviceDeliveryLocation.optJSONObject("location").optJSONObject("name").optJSONObject("item").optJSONObject("part"), "@value");
logger.info("bedNumber : " + bedNumber);
- String roomNumber = serviceDeliveryLocation.optJSONObject("location").optJSONObject("asLocatedEntityPartOf").optJSONObject("location").optJSONObject("name").optJSONObject("item").optJSONObject("part").optString("@value");
+ String roomNumber = CssdUtils.optString(serviceDeliveryLocation.optJSONObject("location").optJSONObject("asLocatedEntityPartOf").optJSONObject("location").optJSONObject("name").optJSONObject("item").optJSONObject("part"), "@value");
logger.info("roomNumber : " + roomNumber);
vo.setPatientArea(patientArea);
vo.setOpRoomId(opRoomId);
vo.setBedNumber(bedNumber);
vo.setRoomNumber(roomNumber);
}
- String remark = procedureRequest.optJSONObject("text").optString("@value");
+ String remark = CssdUtils.optString(procedureRequest.optJSONObject("text"), "@value");
logger.info("remark : " + remark);
String washHandNurse = null;
String circuitNurse = null;
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java
===================================================================
diff -u -r27696 -r40945
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java (.../WebsphereMqDaoImpl.java) (revision 27696)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java (.../WebsphereMqDaoImpl.java) (revision 40945)
@@ -133,7 +133,7 @@
// JSONObject jsonObject = JSONObject.fromObject(testMaterialMqMessage);
JSONObject headJsonObject = jsonObject.optJSONObject("head");
Object bodyObject = jsonObject.opt("body");
- String msgId = headJsonObject.optString("msgId");
+ String msgId = CssdUtils.optString(headJsonObject, "msgId");
if(bodyObject != null){
JSONArray jsonArray = null;
if(bodyObject instanceof JSONObject){
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java
===================================================================
diff -u -r35868 -r40945
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 35868)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java (.../MQHelper.java) (revision 40945)
@@ -760,17 +760,17 @@
if ((jsonArray != null) && (jsonArray.size() > 0)) {
// 3、根据head标签下的msgId字段判断:MS025==科室;MS024==人员
JSONObject headJSON = jsonObject.optJSONObject("head");
- String msgId = (headJSON == null) ? null : headJSON.optString("msgId");
+ String msgId = CssdUtils.optString(headJSON, "msgId");
for (int i = 0; i < jsonArray.size(); i++) {
// 4、第i个row
JSONObject obj = jsonArray.optJSONObject(i);
if ("MS025".equals(msgId)) {// 科室
String coding = null;
String name = null;
String parentCoding = null;
- coding = obj.optString("organizationid");
- name = obj.optString("name");
- parentCoding = obj.optString("parentorganizationid");
+ coding = CssdUtils.optString(obj, "organizationid");
+ name = CssdUtils.optString(obj, "name");
+ parentCoding = CssdUtils.optString(obj, "parentorganizationid");
OrgUnitVo orgUnitVo = new OrgUnitVo();
orgUnitVo.setCoding(coding);
orgUnitVo.setName(name);
@@ -782,9 +782,9 @@
String coding = null;
String name = null;
String orgUnitCoding = null;
- coding = obj.optString("employeeid");
- name = obj.optString("name");
- orgUnitCoding = obj.optString("organizationid");
+ coding = CssdUtils.optString(obj, "employeeid");
+ name = CssdUtils.optString(obj, "name");
+ orgUnitCoding = CssdUtils.optString(obj, "organizationid");
UserVo userVo = new UserVo();
userVo.setCoding(coding);
userVo.setName(name);
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/ksdqdyrmyy/MQHelper.java
===================================================================
diff -u -r39797 -r40945
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/ksdqdyrmyy/MQHelper.java (.../MQHelper.java) (revision 39797)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/ksdqdyrmyy/MQHelper.java (.../MQHelper.java) (revision 40945)
@@ -307,17 +307,17 @@
// 3、根据head标签下的msgId字段判断:MS025==科室;MS024==人员
JSONObject headJSON = jsonObject.optJSONObject("head");
- String msgId = (headJSON == null) ? null : headJSON.optString("msgId");
+ String msgId = CssdUtils.optString(headJSON, "msgId");
for (int i = 0; i < jsonArray.size(); i++) {
// 4、第i个row
JSONObject obj = jsonArray.optJSONObject(i);
if ("MS025".equals(msgId)) {// 科室
String coding = null;
String name = null;
String parentCoding = null;
- coding = obj.optString("code");
- name = obj.optString("name");
- parentCoding = obj.optString("upid");
+ coding = CssdUtils.optString(obj, "code");
+ name = CssdUtils.optString(obj, "name");
+ parentCoding = CssdUtils.optString(obj, "upid");
OrgUnitVo orgUnitVo = new OrgUnitVo();
orgUnitVo.setCoding(coding);
orgUnitVo.setName(name);
@@ -586,20 +586,20 @@
if ((jsonArray != null) && (jsonArray.size() > 0)) {
// 3、根据head标签下的msgId字段判断:MS025==科室;MS024==人员
JSONObject headJSON = jsonObject.optJSONObject("head");
- String msgId = (headJSON == null) ? null : headJSON.optString("msgId");
+ String msgId = CssdUtils.optString(headJSON, "msgId");
for (int i = 0; i < jsonArray.size(); i++) {
// 4、第i个row
JSONObject obj = jsonArray.optJSONObject(i);
if ("MS024".equals(msgId)) {// 人员
String coding = null;
String name = null;
String orgUnitCoding = null;
- coding = obj.optString("code");
- name = obj.optString("name");
+ coding = CssdUtils.optString(obj, "code");
+ name = CssdUtils.optString(obj, "name");
if(StringUtils.equals(jmsDestination, MQHelper.DICT_QUEUE_Founder)){
- orgUnitCoding = obj.optString("departCd");
+ orgUnitCoding = CssdUtils.optString(obj, "departCd");
}else{
- orgUnitCoding = obj.optString("orgid");
+ orgUnitCoding = CssdUtils.optString(obj, "orgid");
}
UserVo userVo = new UserVo();
userVo.setCoding(coding);
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java
===================================================================
diff -u -r37104 -r40945
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 37104)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gyey/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 40945)
@@ -103,16 +103,16 @@
}
for (int i=0;i