Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgqdsrmyy/FindPatientInfoByTreatmentNumDaoImpl.java =================================================================== diff -u -r40507 -r40508 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgqdsrmyy/FindPatientInfoByTreatmentNumDaoImpl.java (.../FindPatientInfoByTreatmentNumDaoImpl.java) (revision 40507) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgqdsrmyy/FindPatientInfoByTreatmentNumDaoImpl.java (.../FindPatientInfoByTreatmentNumDaoImpl.java) (revision 40508) @@ -9,6 +9,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -77,6 +78,9 @@ //vo.setRemark(patientInfo.optString("")); patientInfoVOList.add(vo); } + if(CollectionUtils.isEmpty(patientInfoVOList)){ + return null; + } patientInfoVOList = patientInfoVOList.stream().sorted(new Comparator() { @Override public int compare(PatientInfoVO o1, PatientInfoVO o2) { Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgqdsrmyy/FindPatientInfoByHospitalNumDaoImpl.java =================================================================== diff -u -r40507 -r40508 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgqdsrmyy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 40507) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslgqdsrmyy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 40508) @@ -54,6 +54,10 @@ Object patientInfoObj = message.opt("patientInfo"); //返回的参数是手术申请单,message-applyInfoList Object applyInfoList = message.opt("applyInfoList"); + if(applyInfoList == null){ + //文档上写的是applyInfoList,实际传参是applyList + applyInfoList = message.opt("applyList"); + } if(applyInfoList != null){ //接口返回手术申请单 patientInfoVOList = buildPatientInfoVOByApplyInfoList(applyInfoList); @@ -237,6 +241,7 @@ JSONObject applyInfo = (JSONObject) object; PatientInfoVO vo = new PatientInfoVO(); + //就诊信息对象 1..1 Object visitInfo = applyInfo.opt("visitInfo"); JSONObject visitInfoObj = new JSONObject(); if(visitInfo instanceof JSONObject){ @@ -256,6 +261,7 @@ vo.setBedNumber(visitInfoObj.optString("bedNo")); } + //病人信息对象1..1 JSONObject patientInfoObj = new JSONObject(); Object patientInfo = applyInfo.opt("patientInfo"); if(patientInfo instanceof JSONObject){ @@ -271,6 +277,7 @@ vo.setPatientIDCard(patientInfoObj.optString("idCard")); } + //申请单信息1..1 JSONObject applyInfoJson = new JSONObject(); Object applyInfoObj = applyInfo.opt("applyInfo"); if(applyInfoObj instanceof JSONObject){ @@ -283,6 +290,7 @@ vo.setOperationTime(applyInfoJson.optString("operationScheduledDate")); vo.setOperationScheduleId(applyInfoJson.optString("applyNo")); + //手术信息对象 1..* JSONArray operationInfoArr = new JSONArray(); Object operationInfo = applyInfoJson.opt("operationInfo"); if(operationInfo instanceof JSONObject){