|
@@ -129,16 +129,18 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
|
|
|
//保留最新的入院记录
|
|
|
List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
|
|
|
- if (1l == hisDataDealVO.getModeId() && ListUtil.isNotEmpty(medicalRecordList) && medicalRecordList.size()>1) {
|
|
|
- int count = 0;
|
|
|
+ if (1 == hisDataDealVO.getModeId() && ListUtil.isNotEmpty(medicalRecordList) && medicalRecordList.size()>1) {
|
|
|
for (int i = 0; i < medicalRecordList.size(); i++) {
|
|
|
- if (count >= 1) {
|
|
|
- medicalRecordList.remove(i);
|
|
|
- i--;
|
|
|
+ for (int j = 1; j < medicalRecordList.size(); j++) {
|
|
|
+ if (medicalRecordList.get(i).getBehospitalCode() == medicalRecordList.get(j).getBehospitalCode()) {
|
|
|
+ medicalRecordList.remove(j);
|
|
|
+ i--;
|
|
|
+ j--;
|
|
|
+ }
|
|
|
}
|
|
|
- count++;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
medicalRecordList.forEach(medicalRecord -> {
|
|
|
QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
|
|
|
medicalRecordContentQe.eq("hospital_id", hisDataDealVO.getHospitalId());
|