Browse Source

修改亲属关系表tb_nk为tb_next_of_kin

yys 10 tháng trước cách đây
mục cha
commit
0d7e8e4149

+ 4 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Nk.java

@@ -13,21 +13,18 @@ import lombok.experimental.Accessors;
  * @date 2024-07-19
  */
 @Data
-@TableName(value = "tb_nk")
+@TableName(value = "tb_next_of_kin")
 @Accessors(chain = true)
 public class Nk{
     private static final long serialVersionUID = 1L;
 
     private Long id;
 
-    @ApiModelProperty(value = "近亲姓名")
-    private String name;
-
     @ApiModelProperty(value = "患者id")
-    private Long patientId;
+    private Long patId;
 
-    @ApiModelProperty(value = "NK1 序号,自增长")
-    private Long nkNumber;
+    @ApiModelProperty(value = "近亲姓名")
+    private String name;
 
     @ApiModelProperty(value = "近亲关系 SEL 自己 SPO 配偶 CHD 孩子 MTH 母亲 FTH 父亲 SIB 同胞 BRO 兄弟 SIS 姐妹 FND 朋友 EMR 雇主 OTH 其他")
     private String kinship;

+ 2 - 3
ruoyi-admin/src/main/resources/mapper/work/NkMapper.xml

@@ -5,12 +5,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.web.work.mapper.NkMapper">
 
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Nk">
-        select * from tb_nk
+        select * from tb_next_of_kin
         <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="patientId != null "> and patient_id = #{patientId}</if>
-            <if test="nkNumber != null "> and nk_number = #{nkNumber}</if>
+            <if test="patId != null "> and pat_id = #{patId}</if>
             <if test="kinship != null  and kinship != ''"> and kinship = #{kinship}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>