体检项目bug优化

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java

@@ -99,7 +99,7 @@ public class HealthCheckupListController {
     @ApiOperation("分页查询")
     @SaCheckPermission("healthCheckup.list.mange")
     public Result pageData(PageForm pageForm, String projectId, String subjectId,
-                           String unionId, String unitId, String physicalExaminationStatus) {
+                           String unionId, String unitId, String physicalExaminationStatus, String isAudit) {
         List<HealthCheckupUnionConfirm> confirms = dao.query(HealthCheckupUnionConfirm.class, Cnd.where("projectId", "=", projectId));
 
         HealthCheckupProject project = healthCheckupProjectService.findOne(projectId);
@@ -133,6 +133,16 @@ public class HealthCheckupListController {
         cnd.andEX("hcu.unionId", "=", unionId);
         cnd.andEX("hcu.unitId", "=", unitId);
         cnd.andEX("hcus.subjectId", "=", subjectId);
+        if(StringUtils.isNotBlank(isAudit)){
+            if(isAudit.equals("1")){
+                cnd.and("hcu.isAudit", "=", "1");
+            } else if(isAudit.equals("0")){
+                SqlExpressionGroup group = Cnd.NEW().where();
+                group.andEX("hcu.isAudit", "=", "0");
+                group.orIsNull("hcu.isAudit");
+                cnd.and(group);
+            }
+        }
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId());
         }

src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html

@@ -70,6 +70,16 @@ layout("/layouts/platform.html"){
                                        :key="item.id"></el-option>
                         </el-select>
                     </search-item>
+	                <search-item label="确认状态">
+		                <el-select v-model="pageForm.isAudit" placeholder="请选择" clearable>
+			                <el-option
+					                v-for="item in isAuditOptions"
+					                :key="item.value"
+					                :label="item.label"
+					                :value="item.value">
+			                </el-option>
+		                </el-select>
+	                </search-item>
                 </search>
             </el-card>
 
@@ -288,7 +298,7 @@ layout("/layouts/platform.html"){
                     {prop: 'unitName', label: '所属单位', sortable: true},
                     {prop: 'optionName', label: '所选套餐'},
                     {prop: 'selectTime', label: '选择时间', width: "160px"},
-                    {prop: 'isAudit', label: '是否确认'},
+                    {prop: 'isAudit', label: '是否确认', sortable: true},
                     {prop: 'auditTime', label: '确认时间'},
                     {prop: 'bz', label: '备注',width: "200px"},
                 ],
@@ -314,6 +324,16 @@ layout("/layouts/platform.html"){
                     feedbackInfo: ""
                 },
                 campusOptions: [],
+	            isAuditOptions: [
+						{
+							label: "已确认",
+							value: "1"
+						},
+						{
+							label: "未确认",
+							value: "0"
+						}
+	            ]
             }
         },
         components: {