浏览代码

fix
患者列表需要与当前绑定医院关联
患者列表有重复数据
增加身份证号和是否是新生儿字段

18339543638 4 月之前
父节点
当前提交
bc55b924b7

+ 6 - 0
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizClinicAddOrEditDTO.java

@@ -28,6 +28,12 @@ public class BizClinicAddOrEditDTO implements Serializable {
     @NotBlank  (message = "主键不能为空",groups = {Update.class})
     private String id;
 
+    @ApiModelProperty("身份证号")
+    private String cardNo;
+
+    @ApiModelProperty("是否为新生儿")
+    private Boolean newHuman;
+
     @ApiModelProperty(value = "头像图片链接(医生端可不传)",position = 2)
     private String imageUrl;
 

+ 6 - 0
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizPatientPO.java

@@ -33,6 +33,12 @@ public class BizPatientPO extends TenantPO {
     @ApiModelProperty(value = "当前手术id", position = 6)
     private String currentClinicId;
 
+    @ApiModelProperty("身份证号")
+    private String cardNo;
+
+    @ApiModelProperty("是否为新生儿")
+    private Boolean newHuman;
+
     @TableField(updateStrategy = FieldStrategy.NEVER,fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
     private Integer deleted;
 }

+ 2 - 0
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizClinicRoomServiceImpl.java

@@ -139,6 +139,8 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
             this.baseRepository.insert(clinicRoom);
             //更新患者绑定的最新手术id
             patient.setCurrentClinicId(clinicRoom.getId());
+            patient.setNewHuman(source.getNewHuman());
+            patient.setCardNo(source.getCardNo());
             patientRepository.updateById(patient);
             //更新微信用户患者列表
             roomWxUserService.stdWxAppletInsertBizClinicRoomWxUser(userId, clinicRoom.getId());

+ 6 - 0
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/vo/BizWxAppletClinicDetailVO.java

@@ -23,6 +23,12 @@ public class BizWxAppletClinicDetailVO implements Serializable {
     @ApiModelProperty(value = "id", position = 0)
     private String id;
 
+    @ApiModelProperty("身份证号")
+    private String cardNo;
+
+    @ApiModelProperty("是否为新生儿")
+    private Boolean newHuman;
+
     @ApiModelProperty(value = "头像图片链接",position = 1)
     private String imageUrl;
 

+ 1 - 0
tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizClinicRoomMapper.xml

@@ -72,6 +72,7 @@
             <if test="query.patientCode != null and query.patientCode != ''">
                 and bcr.patient_code like concat('%',#{query.patientCode},'%')
             </if>
+
         </where>
     </select>
 

+ 0 - 1
tr-test/src/main/resources/application.yml

@@ -97,7 +97,6 @@ tr:
       - /oauth2/psw/token
       - /sys/log/**
       - /wx/user/**
-      - /wx/clinic/**
     enable: true
 sa-token:
   is-read-header: true