|
@@ -130,10 +130,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
//保留最新的入院记录
|
|
|
List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
|
|
|
if (1 == hisDataDealVO.getModeId() && ListUtil.isNotEmpty(medicalRecordList) && medicalRecordList.size()>1) {
|
|
|
- for (int i = 0; i < medicalRecordList.size(); i++) {
|
|
|
- for (int j = i+1; j < medicalRecordList.size()-1; j++) {
|
|
|
+ for (int i = 0; i < medicalRecordList.size()-1; i++) {
|
|
|
+ for (int j = i+1; j <= medicalRecordList.size()-1; j++) {
|
|
|
if (medicalRecordList.get(i).getBehospitalCode().equals(medicalRecordList.get(j).getBehospitalCode())) {
|
|
|
- medicalRecordList.get(j).setIsDeleted("Y");
|
|
|
+ medicalRecordList.remove(j);
|
|
|
+ i--;
|
|
|
+ j--;
|
|
|
}
|
|
|
}
|
|
|
}
|