体检名单添加“所选套餐”查询

体检统计导出“用户类型”控制导出值

src/test/java/com/budwk/app/WelfareTest.java

@@ -19,6 +19,7 @@ import cn.hutool.json.JSONUtil;
 import com.budwk.app.sys.models.*;
 import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubject;
 import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupProjectSubjectMoney;
+import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUser;
 import com.budwk.app.zhgh.dayofficework.healthCheckup.model.HealthCheckupUserSelection;
 import com.budwk.app.zhgh.welfare.model.WelfareList;
 import com.budwk.app.zhgh.welfare.model.WelfareProjectSubjectOption;
@@ -82,7 +83,12 @@ public class WelfareTest {
         List<HealthCheckupProjectSubjectMoney> healthCheckupProjectSubjectMoneyList = dao.query(HealthCheckupProjectSubjectMoney.class,
                 Cnd.where(HealthCheckupProjectSubjectMoney::getProjectId, "=", "ccdc49e3d63b4a8cb89c0af0687bb1bf"));
 
+        List<HealthCheckupUser> query = dao.query(HealthCheckupUser.class, Cnd.NEW());
+
         List<PhysicalExamination> physicalExaminationList = ExcelImportUtil.importExcel(new File("C:\\Users\\mayn\\Desktop\\1.xlsx"), PhysicalExamination.class, new ImportParams());
+        physicalExaminationList = physicalExaminationList.stream()
+                .filter(e->query.stream().noneMatch(v->e.getLoginName().equals(v.getLoginName())))
+                .collect(Collectors.toList());
         List<HealthCheckupUserSelection> userSelectionList = physicalExaminationList.stream().map(e -> {
             NutMap nutMap = nutMaps.stream().filter(v -> e.getLoginName().equals(v.getString("loginname"))).findFirst().orElse(null);
             HealthCheckupUserSelection userSelection = new HealthCheckupUserSelection();