Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qifuyy/FindPatientInfoByHospitalNumDaoImpl.java =================================================================== diff -u -r41083 -r41099 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qifuyy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 41083) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qifuyy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 41099) @@ -17,6 +17,7 @@ import com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao; import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO; import com.forgon.exception.SystemException; +import com.forgon.tools.string.StringTools; /** * 与东软his人员科室、患者信息接口开发 @@ -33,7 +34,7 @@ String request = buildHospitalNumPatientInfoRequest(hospitalNum); logger.debug("住院号病人信息同步接口请求信息:" + request); String responce = HttpInterfaceHelper.doPost(DatasyncConstant.HospitalNumHttpServiceAddress, request); - //String responce = "{'code': 200,'msg': '操作成功!','data': [{'age':'100','bedNo':'001','belongDeptCode':'4001','belongDeptName':'手术室','idNo':'111111111111111111','inpatientAreaName':'病区001','name':'患者姓名','operationName':'手术名称','operationApplyNo':'手术申请单号002','operationTime':'2025-10-15 14:50:00','patientNo':'住院号','remark':'备注','sexCode':'2','visitTime':'1'},{'age':'100','bedNo':'001','belongDeptCode':'4001','belongDeptName':'手术室','idNo':'111111111111111111','inpatientAreaName':'病区001','name':'患者姓名','operationName':'手术名称','operationApplyNo':'手术申请单号002','operationTime':'2025-10-11 14:50:00','patientNo':'住院号','remark':'备注','sexCode':'2','visitTime':'1'}]}"; + //String responce = "{'code': 200,'msg': '操作成功!','data': [{'age':'100','bedNo':'001','belongDeptCode':'4001','belongDeptName':'手术室','idNo':'111111111111111111','inpatientAreaName':'病区001','name':'患者姓名','operTypeList':[{'operationName':'手术名称1'}],'operationApplyNo':'手术申请单号002','operationTime':'2025-10-15 14:50:00','patientNo':'住院号','remark':'备注','sexCode':'2','visitTime':'1'},{'age':'100','bedNo':'001','belongDeptCode':'4001','belongDeptName':'手术室','idNo':'111111111111111111','inpatientAreaName':'病区001','name':'患者姓名','operTypeList':[{'operationName':'手术名称2'}],'operationApplyNo':'手术申请单号002','operationTime':'2025-10-11 14:50:00','patientNo':'住院号','remark':'备注','sexCode':'2','visitTime':'1'}]}"; logger.debug("住院号病人信息同步接口返回信息:" + responce); if(StringUtils.isBlank(responce)){ return null; @@ -55,7 +56,20 @@ patientInfoVO.setPatientIDCard(patientJSONObject.optString("idNo")); patientInfoVO.setPatientArea(patientJSONObject.optString("inpatientAreaName")); patientInfoVO.setPatientName(patientJSONObject.optString("name")); - patientInfoVO.setOperation(patientJSONObject.optString("operationName")); + List operationNameList = new ArrayList(); + JSONArray operTypeList = patientJSONObject.optJSONArray("operTypeList"); + if(operTypeList != null && operTypeList.size() > 0){ + for(int j=0;j