fix

删除接口报错
add
所有绑定医院信息新增当前所在医院字段

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizClinicServiceImpl.java

@@ -96,6 +96,9 @@ public class BizClinicServiceImpl extends ServiceImpl<BizClinicRepository,BizCli
         //先判断有没有删除数据的权限
         String userId = LoginUserStrategy.tr.getCurrentUserId();
         List<BizClinicPO> clinics = baseMapper.selectBatchIds(ids);
+        if(CollectionUtil.isEmpty(clinics)){
+            return 0;
+        }
         Map<String, List<BizClinicPO>> clinicMap = clinics.stream()
                 .collect(Collectors.groupingBy(BizClinicPO::getWxUserId));
         if(CollectionUtil.size(clinicMap)>1){
@@ -105,6 +108,9 @@ public class BizClinicServiceImpl extends ServiceImpl<BizClinicRepository,BizCli
         if(CollectionUtil.isNotEmpty(clinicMap)&&CollectionUtil.isEmpty(clinicList)){
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"所选患者手术信息和当前账号没有绑定关系");
         }
+        if(CollectionUtil.isEmpty(clinicList)){
+            return 0;
+        }
         int result = baseMapper.deleteBatchIds(ids);
 
         //判断是否删除了当前看护

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/BizWxAppletClinicController.java

@@ -43,8 +43,7 @@ public class BizWxAppletClinicController extends BaseController{
     public CommonResult<List<BizWxAppletClinicVO>> selectList(@RequestBody BizWxAppletClinicQueryDTO query) {
         query.setUserId(LoginUserStrategy.tr.getCurrentUserId());
         query.setTenantId(TenantContextHolder.getTenantId());
-//        return CommonResult.success(clinicRoomService.stdSelectWxAppletClinicList(query));
-        return CommonResult.success(clinicService.stdSelectWxAppletList(query));
+        return CommonResult.success(clinicRoomService.stdSelectWxAppletClinicList(query));
     }
 
     @ApiOperationSupport(author = "lf",order = 2)

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/vo/BizWxAppletClinicVO.java

@@ -44,26 +44,18 @@ public class BizWxAppletClinicVO implements Serializable {
     @ApiModelProperty(value = "科室id",position = 7)
     private String deptId;
 
+    @ApiModelProperty(value = "病人年龄",position = 8)
+    private Integer patientAge;
 
-    @ApiModelProperty(value = "科室名称",position = 8)
+    @ApiModelProperty(value = "科室名称",position = 9)
     private String deptName;
 
-    @ApiModelProperty(value = "手术名称", position = 9)
+    @ApiModelProperty(value = "手术名称", position = 10)
     private String clinicName;
 
-    @ApiModelProperty(value = "手术状态", position = 10)
+    @ApiModelProperty(value = "手术状态", position = 11)
     private String clinicStatus;
 
     @ApiModelProperty(value = "是否为看护中的临床，0、否 1、是", position = 11)
     private Boolean care;
-
-    @JsonIgnore
-    private Date birthday;
-
-
-    @ApiModelProperty("病人年龄")
-    public Integer getPatientAge(){
-        return AgeUtils.calculateAge(this.getBirthday());
-    }
-
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/vo/BizWxUserBindHospitalVO.java

@@ -1,5 +1,7 @@
 package cn.tr.module.smart.wx.controller.vo;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,4 +24,13 @@ public class BizWxUserBindHospitalVO implements Serializable {
 
     @ApiModelProperty("医院名称")
     private String name;
+
+    @ApiModelProperty(hidden = true)
+    @JsonIgnore
+    private String lastLoginTenantId;
+
+    @ApiModelProperty("是否为当前所在医院")
+    public Boolean getCurrentHospital() {
+        return ObjectUtil.equal(lastLoginTenantId,id);
+    }
 }

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

@@ -7,7 +7,7 @@
     <resultMap id="stdWxAppletResult" type="cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO">
         <result property="id" column="id"/>
         <result property="patientName" column="patient_name"/>
-        <result property="birthday" column="birthday"/>
+        <result property="patientAge" column="patient_age"/>
         <result property="patientGender" column="patient_gender"/>
         <result property="patientCode" column="patient_code"/>
         <result property="clinicStartTime" column="clinic_start_time"/>

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizWxUserMapper.xml

@@ -7,15 +7,19 @@
     <resultMap id="stdWxUserBindHospitalResult" type="cn.tr.module.smart.wx.controller.vo.BizWxUserBindHospitalVO">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
+        <result property="lastLoginTenantId" column="last_login_tenant_id"/>
     </resultMap>
 
     <select id="allBindHospital" resultMap="stdWxUserBindHospitalResult">
         select
             bh.id as id,
-            bh.name as name
+            bh.name as name,
+            bwu.last_login_tenant_id as last_login_tenant_id
         from biz_wx_user_hospital as bwuh
-        join sys_tenant as bh on bh.id = bwuh.tenant_id
+                 join sys_tenant as bh on bh.id = bwuh.tenant_id
+            oin biz_wx_user as bwu on bwu.id=bwuh.wx_user_id
         where bwuh.wx_user_id = #{userId}
         order by bwuh.create_time desc
+
     </select>
- </mapper>
+</mapper>

tr-plugins/tr-spring-boot-starter-plugin-web/src/main/java/cn/tr/plugin/web/wrapper/CacheHttpServletRequestWrapper.java

@@ -33,7 +33,7 @@ public class CacheHttpServletRequestWrapper extends HttpServletRequestWrapper {
         super(request);
         this.bodyString = StreamUtils.copyToString(request.getInputStream(), Charset.defaultCharset());
         body = bodyString.getBytes(Charset.defaultCharset());
-        if(JSONUtil.isTypeJSON(bodyString)){
+        if(JSONUtil.isTypeJSON(bodyString)&&!JSONUtil.isTypeJSONArray(bodyString)){
             bodyParams= JsonUtils.parseMap(bodyString);
         }else {
             String[] split = bodyString.split("&");