解决合并冲突

openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java

@@ -50,7 +50,7 @@ public class OutpatientRecordServiceImpl implements IOutpatientRecordService {
         // 构建查询条件
         QueryWrapper<OutpatientRecordDto> queryWrapper =
             HisQueryUtils.buildQueryWrapper(outpatientRecordSearchParam, searchKey,
-                new HashSet<>(Arrays.asList(CommonConstants.FieldName.idCard, CommonConstants.FieldName.Name,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.IdCard, CommonConstants.FieldName.Name,
                     CommonConstants.FieldName.PatientBusNo, CommonConstants.FieldName.EncounterBusNo)),
                 request);