add

绑定医院

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/repository/BizMissionDocRepository.java

@@ -2,7 +2,7 @@ package cn.tr.module.smart.common.repository;
 
 import cn.tr.module.smart.common.po.BizMissionDocPO;
 import cn.tr.module.smart.wx.controller.vo.BizDeptAndDocVO;
-import cn.tr.module.smart.wx.dto.BizWxQueryPO;
+import cn.tr.module.smart.wx.dto.BizWxQueryDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -26,5 +26,5 @@ public interface BizMissionDocRepository extends BaseMapper<BizMissionDocPO> {
 
     int updateBizMissionDocById(BizMissionDocPO source);
 
-    List<BizDeptAndDocVO> selectBizDeptAndDocByDeptIdList(@Param("query") BizWxQueryPO query);
+    List<BizDeptAndDocVO> selectBizDeptAndDocByDeptIdList(@Param("query") BizWxQueryDTO query);
 }

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

@@ -3,6 +3,7 @@ package cn.tr.module.smart.common.service;
 import cn.tr.module.smart.common.dto.BizMissionDocDTO;
 import cn.tr.module.smart.common.dto.BizMissionDocQueryDTO;
 import cn.tr.module.smart.wx.controller.vo.BizDeptAndDocVO;
+import cn.tr.module.smart.wx.dto.BizWxAllMissionDocQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxKnowledgeDocQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxMissionDocQueryDTO;
 
@@ -91,4 +92,6 @@ public interface IBizMissionDocService {
     List<BizDeptAndDocVO> selectWxKnowledgeDocList(BizWxKnowledgeDocQueryDTO query);
 
     BizDeptAndDocVO selectMissionDocDetail(String docId);
+
+    List<BizDeptAndDocVO> selectWxAllKnowledgeDocList(BizWxAllMissionDocQueryDTO query);
 }

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

@@ -127,6 +127,7 @@ public class BizClinicServiceImpl extends ServiceImpl<BizClinicRepository,BizCli
     public List<BizWxAppletClinicVO> stdSelectWxAppletList(BizWxAppletClinicQueryDTO query) {
         return BizClinicMapper.INSTANCE.convertWxAppletVOList(
                 baseMapper.selectList(new LambdaQueryWrapper<BizClinicPO>()
+                                .like(StrUtil.isNotEmpty(query.getPatientCode()),BizClinicPO::getHospitalNumber,query.getPatientCode())
                         .eq(BizClinicPO::getWxUserId, query.getUserId())
                         .orderByDesc(BizClinicPO::getCare,BizClinicPO::getClinicStartTime))
         );

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

@@ -20,9 +20,10 @@ import cn.tr.module.smart.common.po.*;
 import cn.tr.module.smart.common.repository.*;
 import cn.tr.module.smart.common.service.IBizMissionDocService;
 import cn.tr.module.smart.wx.controller.vo.BizDeptAndDocVO;
+import cn.tr.module.smart.wx.dto.BizWxAllMissionDocQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxKnowledgeDocQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxMissionDocQueryDTO;
-import cn.tr.module.smart.wx.dto.BizWxQueryPO;
+import cn.tr.module.smart.wx.dto.BizWxQueryDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,10 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 宣教文档Service接口实现类
@@ -207,19 +205,7 @@ public class BizMissionDocServiceImpl implements IBizMissionDocService {
         if (Objects.isNull(bizClinicPO)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "患者手术信息不存在");
         }
-        DateTime clinicStartTime = DateUtil.beginOfDay(bizClinicPO.getClinicStartTime());
-        DateTime queryDate = DateUtil.beginOfDay(query.getQueryDate());
-        //计算传入时间跟查无如时间差值
-        long time = DateUtil.between(clinicStartTime, queryDate, DateUnit.DAY);
-        //判断传入时间跟手术开始时间之前  手术当天算术前
-        boolean isBefore = DateUtil.compare(queryDate, clinicStartTime) <= 0;
-        String phase;
-        if (isBefore) {
-            phase = PhaseConstant.BEFORE;
-        } else {
-            phase = PhaseConstant.AFTER;
-        }
-        return baseRepository.selectBizDeptAndDocByDeptIdList(new BizWxQueryPO(bizClinicPO.getDeptId(), time, phase));
+        return selectWxMissionDocListByPhaseAndTime(bizClinicPO.getClinicStartTime(),query.getQueryDate(),bizClinicPO.getDeptId());
     }
 
     /**
@@ -230,7 +216,7 @@ public class BizMissionDocServiceImpl implements IBizMissionDocService {
      */
     @Override
     public List<BizDeptAndDocVO> selectWxKnowledgeDocList(BizWxKnowledgeDocQueryDTO query) {
-        return baseRepository.selectBizDeptAndDocByDeptIdList(new BizWxQueryPO(query.getDeptId(), query.getTitle()));
+        return baseRepository.selectBizDeptAndDocByDeptIdList(new BizWxQueryDTO(query.getDeptId(), query.getTitle()));
     }
 
     @Override
@@ -256,4 +242,24 @@ public class BizMissionDocServiceImpl implements IBizMissionDocService {
         return bizDeptAndDocVO;
     }
 
+    @Override
+    public List<BizDeptAndDocVO> selectWxAllKnowledgeDocList(BizWxAllMissionDocQueryDTO query) {
+        return selectWxMissionDocListByPhaseAndTime(new Date(),query.getQueryDate(),null);
+    }
+
+    private List<BizDeptAndDocVO> selectWxMissionDocListByPhaseAndTime(Date startTime,Date queryTime,String deptId){
+        DateTime clinicStartTime = DateUtil.beginOfDay(startTime);
+        DateTime queryDate = DateUtil.beginOfDay(queryTime);
+        //计算传入时间跟查无如时间差值
+        long time = DateUtil.between(clinicStartTime, queryDate, DateUnit.DAY);
+        //判断传入时间跟手术开始时间之前  手术当天算术前
+        boolean isBefore = DateUtil.compare(queryDate, clinicStartTime) <= 0;
+        String phase;
+        if (isBefore) {
+            phase = PhaseConstant.BEFORE;
+        } else {
+            phase = PhaseConstant.AFTER;
+        }
+        return baseRepository.selectBizDeptAndDocByDeptIdList(new BizWxQueryDTO(deptId, time, phase));
+    }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizHospitalController.java

@@ -1,83 +0,0 @@
-package cn.tr.module.smart.web.controller;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.tr.module.sys.oauth2.LoginTypeConstant;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.tr.core.validation.Insert;
-import cn.tr.core.validation.Update;
-import cn.tr.core.pojo.CommonResult;
-import lombok.AllArgsConstructor;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import cn.tr.module.smart.common.dto.BizHospitalDTO;
-import cn.tr.module.smart.common.service.IBizHospitalService;
-import cn.tr.module.smart.common.dto.BizHospitalQueryDTO;
-import java.util.*;
-import cn.tr.plugin.mybatis.base.BaseController;
-import org.springframework.web.bind.annotation.*;
-import cn.tr.module.api.sys.log.annotation.OperateLog;
-import cn.tr.core.pojo.TableDataInfo;
-/**
- * 医院信息控制器
- *
- * @author lf
- * @date  2025/05/23 16:33
- */
-@Api(tags = "医院信息")
-@RestController
-@RequestMapping("/web/hospital")
-@AllArgsConstructor
-@SaCheckLogin(type = LoginTypeConstant.WEB)
-public class BizHospitalController extends BaseController{
-
-    private final IBizHospitalService bizHospitalService;
-
-    @ApiOperationSupport(author = "lf",order = 1)
-    @ApiOperation(value="根据条件查询医院信息",notes = "权限： 无")
-    @PostMapping("/query/page")
-    public TableDataInfo<BizHospitalDTO> selectList(@RequestBody BizHospitalQueryDTO query) {
-        startPage();
-        return getDataTable(bizHospitalService.selectBizHospitalList(query));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 2)
-    @ApiOperation(value = "根据id查询医院信息",notes = "权限： web:hospital:query")
-    @GetMapping("/detail/{id}")
-    @SaCheckPermission("web:hospital:query")
-    public CommonResult<BizHospitalDTO> findById(@PathVariable("id") String id){
-        return CommonResult.success(bizHospitalService.selectBizHospitalById(id));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 3)
-    @ApiOperation(value="添加医院信息",notes = "权限： web:hospital:add")
-    @PostMapping("/add")
-    @OperateLog
-    @SaCheckPermission("web:hospital:add")
-    public CommonResult<Boolean> add(@RequestBody@Validated(Insert.class) BizHospitalDTO source) {
-        return CommonResult.success(bizHospitalService.insertBizHospital(source));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 4)
-    @ApiOperation(value="通过主键id编辑医院信息",notes = "权限： web:hospital:edit")
-    @PostMapping("/edit")
-    @OperateLog
-    @SaCheckPermission("web:hospital:edit")
-    public CommonResult<Boolean> edit(@RequestBody@Validated(Update.class) BizHospitalDTO source) {
-        return CommonResult.success(bizHospitalService.updateBizHospitalById(source));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 5)
-    @ApiOperation(value="删除医院信息",notes = "权限： web:hospital:remove")
-    @PostMapping("/removeByIds")
-    @OperateLog
-    @SaCheckPermission("web:hospital:remove")
-    public CommonResult<Integer> delete(@RequestBody Collection<String> ids) {
-        return CommonResult.success(bizHospitalService.removeBizHospitalByIds(ids));
-    }
-}

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

@@ -94,4 +94,5 @@ public class BizWxAppletClinicController extends BaseController{
     public CommonResult<BizPreSurgeryQuestionVO> preSurgeryQuestionnaire(@PathVariable("clinicId") String clinicId){
         return CommonResult.success(clinicService.selectPreSurgeryQuestionnaire(clinicId));
     }
+
 }

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

@@ -27,6 +27,7 @@ import java.util.*;
 @Slf4j
 @RequestMapping("/wx/user")
 @Api(tags = "微信小程序用户")
+//@SaCheckLogin(type = LoginTypeConstant.WX_APPLET)
 public class WxAppletUserController {
     private final WxMaService wxMaService;
 

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

@@ -6,6 +6,7 @@ import cn.binarywang.wx.miniapp.constant.WxMaConstants;
 import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
 import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.tr.core.annotation.TenantIgnore;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +30,7 @@ public class WxPortalController {
     private final WxMaMessageRouter wxMaMessageRouter;
 
     @GetMapping(produces = "text/plain;charset=utf-8")
+    @TenantIgnore
     public String authGet(@PathVariable String appid,
                           @RequestParam(name = "signature", required = false) String signature,
                           @RequestParam(name = "timestamp", required = false) String timestamp,
@@ -54,6 +56,7 @@ public class WxPortalController {
     }
 
     @PostMapping(produces = "application/xml; charset=UTF-8")
+    @TenantIgnore
     public String post(@PathVariable String appid,
                        @RequestBody String requestBody,
                        @RequestParam(name = "msg_signature", required = false) String msgSignature,

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizWxAllMissionDocQueryDTO.java

@@ -0,0 +1,31 @@
+package cn.tr.module.smart.wx.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author wangzl
+ * @description: TODO
+ * @date 2025/6/3 16:23
+ */
+@Data
+@ApiModel("所有宣教文档查询参数")
+@ToString
+public class BizWxAllMissionDocQueryDTO {
+
+
+    @ApiModelProperty("查询日期")
+    @NotNull(message = "查询日期不能为空")
+    @DateTimeFormat(pattern  = "yyyy-MM-dd")
+    private Date queryDate;
+
+}

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizWxAppletClinicQueryDTO.java

@@ -22,4 +22,7 @@ public class BizWxAppletClinicQueryDTO {
 
     @ApiModelProperty(value = "当前租户id",hidden = true)
     private String tenantId;
+
+    @ApiModelProperty("住院号")
+    private String patientCode;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizWxQueryPO.java → tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizWxQueryDTO.java

@@ -8,19 +8,19 @@ import lombok.Data;
  * @date 2025/6/4 14:07
  */
 @Data
-public class BizWxQueryPO {
+public class BizWxQueryDTO {
     private String deptId;
     private Long time;
     private String phase;
     private String title;
 
-    public BizWxQueryPO(String deptId, Long time, String phase) {
+    public BizWxQueryDTO(String deptId, Long time, String phase) {
         this.deptId = deptId;
         this.time = time;
         this.phase = phase;
     }
 
-    public BizWxQueryPO(String deptId, String title) {
+    public BizWxQueryDTO(String deptId, String title) {
         this.deptId = deptId;
         this.title = title;
     }

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

@@ -14,7 +14,7 @@
             bh.id as id,
             bh.name as name
         from biz_wx_user_hospital as bwuh
-        join biz_hospital as bh on bh.id = bwuh.tenant_id
+        join sys_tenant as bh on bh.id = bwuh.tenant_id
         where bwuh.wx_user_id = #{userId}
         order by bwuh.create_time desc
     </select>