bug修改

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -353,7 +353,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("hospital_id", hospitalId)
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
                 .select("whole_data", "rec_id", "hospital_id")
-                .orderByDesc("behospital_date")
+                .orderByDesc("behospital_date","rec_id")
                 .last("limit 1")
         );
 

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -121,26 +121,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         medicalRecordQe.eq("hospital_id", hisDataDealVO.getHospitalId());
         medicalRecordQe.eq("mode_id", hisDataDealVO.getModeId());
         medicalRecordQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        medicalRecordQe.orderByDesc("rec_date");
-        medicalRecordQe.orderByDesc("rec_id");
+        medicalRecordQe.orderByDesc("rec_date","rec_id");
         if (hisDataDealVO.getRecIdList().size() > 0) {
             medicalRecordQe.in("rec_id", hisDataDealVO.getRecIdList());
         }
-
-      //保留最新的入院记录
         List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
-        if (1 == hisDataDealVO.getModeId() && ListUtil.isNotEmpty(medicalRecordList) && medicalRecordList.size()>1) {
-            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.remove(j);
-                        i--;
-                        j--;
-                    }
-                }
-            }
-        }
-
             medicalRecordList.forEach(medicalRecord -> {
                         QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
                         medicalRecordContentQe.eq("hospital_id", hisDataDealVO.getHospitalId());