xiaochan 1 year ago
parent
commit
a82d3af55e

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -828,7 +828,7 @@ public interface YiZhuLuRuDao {
             "       rtrim(supply_name) name, " +
             "       py_code, " +
             "       d_code as          w_code " +
-            "from yz_supply_type with (NOLOCK)")
+            "from yz_supply_type with (NOLOCK) where isnull(del_flag , '0') <> '1'")
     List<SelectV2> selectSupplyType();
 
 

+ 3 - 1
src/main/java/thyyxxk/webserver/entity/chronicDisease/CrmPatientMi.java

@@ -1,6 +1,8 @@
 package thyyxxk.webserver.entity.chronicDisease;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -26,7 +28,6 @@ public class CrmPatientMi implements Serializable {
     /**
      * 用户ID
      */
-//    @TableId(value = "p_id", type = IdType.AUTO)
     @JsonProperty("pId")
     private String pId;
     /**
@@ -70,6 +71,7 @@ public class CrmPatientMi implements Serializable {
     /**
      * 证件号
      */
+    @TableId(value = "p_id", type = IdType.NONE)
     private String socialNo;
     /**
      * 卡号