性别

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/FactorEnchanceController.java

@@ -297,7 +297,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
         FactorEnchance factorEnchance = new FactorEnchance();
         QueryWrapper<FactorEnchance> queryWrapper = QueryGenerator.initQueryWrapper(factorEnchance, req.getParameterMap());
         Page<FactorEnchance> page = new Page<FactorEnchance>(pageNo, pageSize);
-        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+//        queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
         queryWrapper.in("factor_catalog", medicalInsRuleInfoId, shareRulesId);
         //过滤自身规则
         if (list.size() > 0) {
@@ -325,7 +325,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
                 Optional<FactorEnchance> first = factorEnchanceList.stream().filter(o ->
                         ObjectUtils.nullSafeEquals(o.getId(), info.getFactorEnhanceId())).findFirst();
                 if (first.isPresent()) {
-                    response.setType(first.get().getEnhanceType().toString());
+                    response.setType(first.get().getEnhanceType()==null?null:first.get().getEnhanceType().toString());
                 }
                 responses.add(response);
             }