提交merge1.3

openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java

@@ -12,8 +12,12 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+<<<<<<< HEAD
 import com.core.common.enums.DeleteFlag;
 import com.openhis.common.enums.DelFlag;
+=======
+import com.core.common.enums.DelFlag;
+>>>>>>> v1.3
 import com.openhis.common.enums.GfRatioType;
 import com.openhis.common.enums.ItemType;
 import com.openhis.common.enums.ybenums.YbChrgitmLv;
@@ -87,7 +91,11 @@ public class GfRatioServiceImpl extends ServiceImpl<GfRatioMapper, GfRatio> impl
         // 查询DB中的所有大项比例
         List<GfRatio> gfRatioList =
             this.list(new LambdaQueryWrapper<GfRatio>().eq(GfRatio::getRatioType, GfRatioType.TYPE_RATIO.getValue())
+<<<<<<< HEAD
                 .eq(GfRatio::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+=======
+                .eq(GfRatio::getDeleteFlag, DelFlag.NO.getCode()));
+>>>>>>> v1.3
         // 做成医保分项+医保等级拼接的Map
         Map<String, GfRatio> gfRatioMap =
             gfRatioList.stream().collect(Collectors.toMap(e -> e.getYbClass() + e.getYbLv(), Function.identity()));