Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslhqzxyy/FindPatientInfoByHospitalNumDaoImpl.java =================================================================== diff -u -r31346 -r31354 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslhqzxyy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 31346) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/szslhqzxyy/FindPatientInfoByHospitalNumDaoImpl.java (.../FindPatientInfoByHospitalNumDaoImpl.java) (revision 31354) @@ -12,6 +12,7 @@ import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao; import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO; +import com.forgon.tools.db.DatabaseUtil; /** * 根据住院号查询病人信息(深圳市龙华区中心医院) @@ -100,21 +101,22 @@ if(!StringUtils.equals(AGE_MONTH, "0")){ patientAge = AGE_MONTH + "月"; }else if(!StringUtils.equals(AGE_DAY, "0")){ - patientAge = AGE_MONTH + "天"; + patientAge = AGE_DAY + "天"; }else if(!StringUtils.equals(AGE_HOUR, "0")){ - patientAge = AGE_MONTH + "时"; + patientAge = AGE_HOUR + "时"; } } if(StringUtils.equals(GENDER_CODE, "2")){ GENDER_NAME = "女"; } + VISIT_NO = DatabaseUtil.isPoIdValid(VISIT_NO) ? VISIT_NO : "0"; vo.setHospitalNumber(hospitalNum); vo.setPatientName(PATIENT_NAME); vo.setPatientAge(patientAge); vo.setPatientSex(GENDER_NAME); vo.setAscriptionDepartment(VISIT_WARD_NAME); vo.setBedNumber(BED_NO); - vo.setVisitAmount(VISIT_NO); + vo.setVisitId(Long.parseLong(VISIT_NO)); patientInfoVOList.add(vo); } if (CollectionUtils.isNotEmpty(patientInfoVOList)) {