抗原异常上报bug修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YcsbController.java

@@ -111,6 +111,11 @@ public class YcsbController extends BaseController
             } else if ("1".equals(ycsbExport.getCheckCard())) {
                 ycsbExport.setCheckCard("正确");
             }
+            if ("1".equals(ycsbExport.getKyResult())) {
+                ycsbExport.setKyResult("正常");
+            } else {
+                ycsbExport.setKyResult("异常");
+            }
 
         }
         util.exportExcel(response, list, "抗原异常上报数据");

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YcsbServiceImpl.java

@@ -221,6 +221,11 @@ public class YcsbServiceImpl implements IYcsbService
                 } else if ("否".equals(ycsb.getHasAcid())) {
                     ycsb.setHasAcid("1");
                 }
+                if ("正常".equals(ycsb.getKyResult())) {
+                    ycsb.setKyResult("1");
+                } else {
+                    ycsb.setKyResult("0");
+                }
                 String createBy = DataUtils.getValue(ycsb.getArea(), ycsb.getStreet(), ycsb.getCommittee());
                 if ("null".equals(createBy)) {
                     throw new ServiceException("所选居住地、街道、社区不存在");

ruoyi-ui/src/views/system/ycsb/index.vue

@@ -176,7 +176,7 @@
       <el-table-column label="姓名" align="center" prop="userName"  width="100" :show-overflow-tooltip="true" />
       <el-table-column label="抗原结果" align="center" prop="kyResult"  width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ scope.row.kyResult === '0' ? '异常' : '正常'}}</span>
+          <span>{{ scope.row.kyResult === '1' ? '正常' : '异常'}}</span>
         </template>
       </el-table-column>
       <el-table-column label="是否做核酸" align="center" prop="hasAcid" width="120" :show-overflow-tooltip="true">