Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

src/main/java/com/syjiaer/clinic/server/entity/social/SocialUser.java

@@ -5,34 +5,32 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
 /**
  * <p>
- * 
+ * 医保用户信息表
  * </p>
  *
  * @author NiuZiYuan
- * @since 2025-04-03
+ * @since 2025-05-22
  */
 @Getter
 @Setter
 @ToString
 @Accessors(chain = true)
 @TableName("social_user")
-@ApiModel(value = "SocialUser对象", description = "")
+@ApiModel(value = "SocialUser对象", description = "医保用户信息表")
 public class SocialUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("id")
+    @ApiModelProperty("自增主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -42,6 +40,9 @@ public class SocialUser implements Serializable {
     @ApiModelProperty("人员证件类型")
     private String psnCertType;
 
+    @ApiModelProperty("性别")
+    private String gend;
+
     @ApiModelProperty("证件号码")
     private String certno;
 
@@ -56,4 +57,7 @@ public class SocialUser implements Serializable {
 
     @ApiModelProperty("年龄")
     private BigDecimal age;
+
+    @ApiModelProperty("全数据")
+    private String data;
 }

src/main/java/com/syjiaer/clinic/server/service/social/SocialUserService.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.service.social;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.syjiaer.clinic.server.common.api.input.IM1101;
 import com.syjiaer.clinic.server.common.api.input.IM5267;
@@ -59,6 +60,8 @@ public class SocialUserService {
         socialUser.setPsnNo(om1101.getBaseinfo().getPsn_no());
         socialUser.setPsnCertType(om1101.getBaseinfo().getPsn_cert_type());
         socialUser.setPsnName(om1101.getBaseinfo().getPsn_name());
+        socialUser.setGend(om1101.getBaseinfo().getGend());
+        socialUser.setData(JSONObject.toJSONString(om1101));
         socialUserMapper.insertOrUpdate(socialUser);
         om1101.setId(socialUser.getId());
         IM5267 im5267 = new IM5267();