其他信息展示升序修改

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

@@ -46,6 +46,7 @@ public class MedicalRecordOtherFacade extends MedicalRecordServiceImpl {
      * @return
      */
     public IPage<MedicalRecord> pageFac(MedRecordOtherVO medRecordOtherVO) {
+        Boolean flag = false;
         QueryWrapper<MedicalRecord> medicalRecordQueryWrapper = new QueryWrapper<>();
         medicalRecordQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         medicalRecordQueryWrapper.eq("hospital_id", Long.valueOf(SysUserUtils.getCurrentHospitalID()));
@@ -63,16 +64,19 @@ public class MedicalRecordOtherFacade extends MedicalRecordServiceImpl {
         if (medRecordOtherVO.getRecDateEnd() != null && medRecordOtherVO != null) {
             medicalRecordQueryWrapper.le("rec_date", medRecordOtherVO.getRecDateEnd());
         }
-        if (medRecordOtherVO.getOrders() != null) {
+        for (Object order : medRecordOtherVO.getOrders()) {
             ObjectMapper objectMapper = new ObjectMapper();
-            OrderItem orderName = objectMapper.convertValue(medRecordOtherVO.getOrders().get(0), OrderItem.class);
+            OrderItem orderName = objectMapper.convertValue(order, OrderItem.class);
             String column = orderName.getColumn();
-            if (StringUtil.isNotEmpty(column)) {
-                medicalRecordQueryWrapper.orderByDesc("rec_date");
-            } else {
-                medicalRecordQueryWrapper.orderByAsc("rec_date");
+            if (StringUtil.isNotEmpty(column) && orderName.isAsc()) {
+                flag = true;
             }
         }
+        if (flag) {
+            medicalRecordQueryWrapper.orderByAsc("rec_date");
+        } else {
+            medicalRecordQueryWrapper.orderByDesc("rec_date");
+        }
 
         Page<MedicalRecord> pageCase = new Page<MedicalRecord>(medRecordOtherVO.getCurrent(), medRecordOtherVO.getSize());
         IPage<MedicalRecord> medicalRecordIPage = medicalRecordFacade.getBaseMapper().selectPage(pageCase, medicalRecordQueryWrapper);