Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r15493 -r15499 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 15493) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 15499) @@ -2498,39 +2498,53 @@ return (UseRecord) objectDao.getBySql( UseRecord.class.getSimpleName(), sql); } - /*private PatientInfoVO defaultPatientInfo(){ - PatientInfoVO patientInfo = new PatientInfoVO(); - patientInfo.setBedNumber("111"); - patientInfo.setDoctorName("李英"); - patientInfo.setOperation("胆囊切除手术"); - patientInfo.setOperationTime("2016年4月5日"); - patientInfo.setPatientAge("23"); - patientInfo.setPatientArea("第一病区"); - patientInfo.setPatientIDCard("421135199302161352"); - patientInfo.setPatientName("李白"); - patientInfo.setPatientNumber("000000"); - patientInfo.setPatientSex("男"); - patientInfo.setRoomNumber("213"); - patientInfo.setType(PatientInfoVO.TYPE_HOSPITAL); - return patientInfo; - }*/ +// private PatientInfoVO defaultPatientInfo(){ +// PatientInfoVO patientInfo = new PatientInfoVO(); +// patientInfo.setBedNumber("111"); +// patientInfo.setDoctorName("李英"); +// patientInfo.setOperation("胆囊切除手术"); +// patientInfo.setOperationTime("2016年4月5日"); +// patientInfo.setPatientAge("23"); +// patientInfo.setPatientArea("第一病区"); +// patientInfo.setPatientIDCard("421135199302161352"); +// patientInfo.setPatientName("李白"); +// patientInfo.setPatientNumber("zy000000"); +// patientInfo.setPatientSex("男"); +// patientInfo.setRoomNumber("213"); +// patientInfo.setType(PatientInfoVO.TYPE_CLINIC); +// return patientInfo; +// } + private void setHospitalNumOrTreatmentNum(UseRecord record,String patientNum, String numType){ + if(record == null){ + return; + } + switch(numType){ + case "treatmentNum": + record.setTreatmentNum(patientNum); + break; + case "hospitalNum": + record.setHospitalNum(patientNum); + break; + } + } @Override public UseRecord getSyncUseRecordByHostpitalNumOrTreatmentNum(String patientNum, String numType){ UseRecord record = getUseRecordByHostpitalNumOrTreatmentNum(patientNum,numType); PatientInfoVO patientInfo = null; try{ patientInfo = dataSynchronizationManager.findPatientInfoByHospitalNumOrTreatmentNum(patientNum,numType); - /*if("000000".equals(patientNum)){ - patientInfo = defaultPatientInfo(); - }else{ - patientInfo = dataSynchronizationManager.findPatientInfoByHospitalNumOrTreatmentNum(patientNum,numType); - }*/ +// if("000000".equals(patientNum)){ +// patientInfo = defaultPatientInfo(); +// }else{ +// patientInfo = dataSynchronizationManager.findPatientInfoByHospitalNumOrTreatmentNum(patientNum,numType); +// } }catch(Exception ex){ ex.printStackTrace(); } if(patientInfo != null){ if(record == null){ record = new UseRecord(); + setHospitalNumOrTreatmentNum(record,patientNum,numType); } updateUseRecordByPatientInfo(record,patientInfo); }