修改核酸采集字段

ruoyi-system/src/main/java/com/ruoyi/system/domain/Hscj.java

@@ -100,7 +100,7 @@ public class Hscj extends BaseEntity
 
     /** 标本类型 */
     @Excel(name = "标本类型")
-    private String bType;
+    private String bblx;
 
     /** 接收实验室 */
     @Excel(name = "接收实验室")
@@ -318,15 +318,7 @@ public class Hscj extends BaseEntity
     {
         return cjPhone;
     }
-    public void setBType(String BType)
-    {
-        this.bType = BType;
-    }
 
-    public String getBType()
-    {
-        return bType;
-    }
     public void setLaboratory(String laboratory)
     {
         this.laboratory = laboratory;
@@ -382,6 +374,14 @@ public class Hscj extends BaseEntity
         return delFlag;
     }
 
+    public String getBblx() {
+        return bblx;
+    }
+
+    public void setBblx(String bblx) {
+        this.bblx = bblx;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -403,7 +403,7 @@ public class Hscj extends BaseEntity
             .append("cjTime", getCjTime())
             .append("cjName", getCjName())
             .append("cjPhone", getCjPhone())
-            .append("bType", getBType())
+            .append("bblx", getBblx())
             .append("laboratory", getLaboratory())
             .append("jcTime", getJcTime())
             .append("rygx", getRygx())

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

@@ -142,7 +142,7 @@ public class HscjServiceImpl implements IHscjService {
                     && StringUtils.isNotEmpty(hscj.getCjTime().toString())
                     && StringUtils.isNotEmpty(hscj.getCjName())
                     && StringUtils.isNotEmpty(hscj.getCjPhone())
-                    && StringUtils.isNotEmpty(hscj.getBType())
+                    && StringUtils.isNotEmpty(hscj.getBblx())
             ) {
                 Hscj hscjQuerry = new Hscj();
                 hscjQuerry.setCardNo(hscj.getCardNo());

ruoyi-system/src/main/resources/mapper/system/HscjMapper.xml

@@ -24,7 +24,7 @@
         <result property="cjTime" column="cj_time"/>
         <result property="cjName" column="cj_name"/>
         <result property="cjPhone" column="cj_phone"/>
-        <result property="bType" column="b_type"/>
+        <result property="bblx" column="b_type"/>
         <result property="laboratory" column="laboratory"/>
         <result property="jcTime" column="jc_time"/>
         <result property="cjResult" column="cj_Result"/>
@@ -98,7 +98,7 @@
         <if test="cjTime != null ">and a.cj_time = #{cjTime}</if>
         <if test="cjName != null  and cjName != ''">and a.cj_name like concat('%', #{cjName}, '%')</if>
         <if test="cjPhone != null  and cjPhone != ''">and a.cj_phone like concat('%', #{cjPhone}, '%')</if>
-        <if test="bType != null  and bType != ''">and a.b_type like concat('%', #{bType}, '%')</if>
+        <if test="bblx != null  and bblx != ''">and a.b_type like concat('%', #{bblx}, '%')</if>
         <if test="laboratory != null  and laboratory != ''">and a.laboratory like concat('%', #{laboratory}, '%')</if>
         <if test="jcTime != null ">and a.jc_time = #{jcTime}</if>
         <if test="rygx != null  and rygx != ''">and a.rygx like concat('%', #{rygx}, '%')</if>
@@ -133,7 +133,7 @@
             <if test="cjTime != null">cj_time,</if>
             <if test="cjName != null">cj_name,</if>
             <if test="cjPhone != null">cj_phone,</if>
-            <if test="bType != null">b_type,</if>
+            <if test="bblx != null">b_type,</if>
             <if test="laboratory != null">laboratory,</if>
             <if test="jcTime != null">jc_time,</if>
             <if test="cjResult != null">cj_result,</if>
@@ -166,7 +166,7 @@
             <if test="cjTime != null">#{cjTime},</if>
             <if test="cjName != null">#{cjName},</if>
             <if test="cjPhone != null">#{cjPhone},</if>
-            <if test="bType != null">#{bType},</if>
+            <if test="bblx != null">#{bblx},</if>
             <if test="laboratory != null">#{laboratory},</if>
             <if test="jcTime != null">#{jcTime},</if>
             <if test="cjResult != null">#{cjResult},</if>
@@ -203,7 +203,7 @@
             <if test="cjTime != null">cj_time = #{cjTime},</if>
             <if test="cjName != null">cj_name = #{cjName},</if>
             <if test="cjPhone != null">cj_phone = #{cjPhone},</if>
-            <if test="bType != null">b_type = #{bType},</if>
+            <if test="bblx != null">b_type = #{bblx},</if>
             <if test="laboratory != null">laboratory = #{laboratory},</if>
             <if test="jcTime != null">jc_time = #{jcTime},</if>
             <if test="rygx != null">rygx = #{rygx},</if>

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

@@ -143,9 +143,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="标本类型" prop="bType">
+      <el-form-item label="标本类型" prop="bblx">
         <el-input
-          v-model="queryParams.bType"
+          v-model="queryParams.bblx"
           placeholder="请输入标本类型"
           clearable
           @keyup.enter.native="handleQuery"
@@ -290,7 +290,7 @@
       </el-table-column>
       <el-table-column label="采集人姓名" align="center" prop="cjName" />
       <el-table-column label="采集人电话" align="center" prop="cjPhone" />
-      <el-table-column label="标本类型" align="center" prop="bType" />
+      <el-table-column label="标本类型" align="center" prop="bblx" />
       <el-table-column label="接收实验室" align="center" prop="laboratory" />
       <el-table-column label="检测时间" align="center" prop="jcTime" width="180">
         <template slot-scope="scope">
@@ -424,8 +424,8 @@
         <el-form-item label="采集人电话" prop="cjPhone">
           <el-input v-model="form.cjPhone" placeholder="请输入采集人电话" />
         </el-form-item>
-        <el-form-item label="标本类型" prop="bType">
-          <el-input v-model="form.bType" placeholder="请输入标本类型" />
+        <el-form-item label="标本类型" prop="bblx">
+          <el-input v-model="form.bblx" placeholder="请输入标本类型" />
         </el-form-item>
         <el-form-item label="接收实验室" prop="laboratory">
           <el-input v-model="form.laboratory" placeholder="请输入接收实验室" />
@@ -570,7 +570,7 @@ export default {
         cjTime: null,
         cjName: null,
         cjPhone: null,
-        bType: null,
+        bblx: null,
         laboratory: null,
         jcTime: null,
         rygx: null,
@@ -632,7 +632,7 @@ export default {
         cjPhone: [
           { required: true, message: "请输入采集人电话", trigger: "blur" }
         ],
-        bType: [
+        bblx: [
           { required: true, message: "请输入标本类型", trigger: "blur" }
         ],
       }
@@ -777,7 +777,7 @@ export default {
         cjTime: null,
         cjName: null,
         cjPhone: null,
-        bType: null,
+        bblx: null,
         laboratory: null,
         cjResult: null,
         jcTime: null,