|
@@ -121,13 +121,23 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
|
|
|
medicalRecordQe.eq("hospital_id", hisDataDealVO.getHospitalId());
|
|
|
medicalRecordQe.in("mode_id", hisDataDealVO.getModeId());
|
|
|
medicalRecordQe.in("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
+ medicalRecordQe.orderByDesc("rec_date");
|
|
|
if (hisDataDealVO.getRecIdList().size() > 0) {
|
|
|
medicalRecordQe.in("rec_id", hisDataDealVO.getRecIdList());
|
|
|
}
|
|
|
+
|
|
|
List<MedicalRecord> medicalRecordList = medicalRecordService.list(medicalRecordQe);
|
|
|
-
|
|
|
- medicalRecordList.forEach(medicalRecord -> {
|
|
|
+ ArrayList<Integer> indexList = Lists.newArrayList();
|
|
|
+ for (MedicalRecord medicalRecord : medicalRecordList) {
|
|
|
+ if("1l".equals(medicalRecord.getModeId())){
|
|
|
+ indexList.add(medicalRecordList.indexOf(medicalRecord)) ;
|
|
|
+ if(indexList.size()>1){
|
|
|
+ medicalRecordList.remove(medicalRecord);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+ medicalRecordList.forEach(medicalRecord -> {
|
|
|
QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
|
|
|
medicalRecordContentQe.eq("hospital_id", hisDataDealVO.getHospitalId());
|
|
|
medicalRecordContentQe.eq("rec_id", medicalRecord.getRecId());
|