建床新增修改接口联调

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -390,6 +390,7 @@ public class DisableController {
         return Result.success(searchDisableSimpleVoIPage);
     }
 
+
     /**
      * 失能人员信息详情（失能人员信息修改申请详情页面-新增）
      *

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/governance/ChSrvBuildBed.java

 package com.hungraim.ltc.pojo.entity.governance;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,10 +11,12 @@ import java.util.Date;
  */
 @Data
 @TableName("CH_SRV_BUILD_BED")
+@KeySequence(value = "SEQ_CH_SRV_BUILD_BED")
 public class ChSrvBuildBed implements Serializable {
     /**
      * 建床ID
      */
+    @TableId(value = "BUILD_BED_ID", type = IdType.INPUT)
     private Integer buildBedId;
 
     /**
@@ -166,7 +167,7 @@ public class ChSrvBuildBed implements Serializable {
     /**
      * 基本情况评估——既往史（其它（1有，0无））
      */
-    private Integer pastOther;
+        private Integer pastOther;
 
     /**
      * 基本情况评估——既往史（其它-备注）

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/governance/ChSrvRemoveBed.java

 package com.hungraim.ltc.pojo.entity.governance;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -10,10 +13,12 @@ import java.util.Date;
  */
 @Data
 @TableName("CH_SRV_REMOVE_BED")
+@KeySequence(value = "SEQ_CH_SRV_REMOVE_BED")
 public class ChSrvRemoveBed {
     /**
      * 撤床ID
      */
+    @TableId(value = "REMOVE_BED_ID", type = IdType.INPUT)
     private Integer removeBedId;
     /**
      * 护理机构ID

common/common-core/src/main/java/com/hungraim/ltc/util/AttachType.java

@@ -60,14 +60,14 @@ public enum AttachType {
     SRV_ORGAN_EMP((short) 15),
 
     /**
-     * 16:服务计划制定附件;
+     * 16:护理人员服务项目结束附件;
      */
     SRV_TASK((short) 16),
 
     /**
-     * 17:鉴定机构人员附件;
+     * 17:建床;
      */
-    APR_EMP((short) 17);
+    BUILD_BED((short) 17);
 
     private Short uploadType;
 

governance/src/main/java/com/hungraim/ltc/governance/controller/BuildBedController.java

@@ -9,15 +9,14 @@ import com.hungraim.ltc.governance.service.IBuildBedService;
 import com.hungraim.ltc.governance.service.SrvSendService;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
-import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
 import com.hungraim.ltc.pojo.vo.disable.ChrSrvVo;
-import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
-import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
-import com.hungraim.ltc.pojo.vo.governance.DisableInfoVo;
-import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
+import com.hungraim.ltc.pojo.vo.disable.SearchDisableSimpleVo;
+import com.hungraim.ltc.pojo.vo.governance.*;
 import com.hungraim.ltc.util.Result;
+import com.hungraim.ltc.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,38 +55,37 @@ public class BuildBedController {
      * 建床管理新增
      */
     @PostMapping("/addBuild")
-    public Result<Boolean> buildBed(ChSrvBuildBed buildBed) {
-        /*if (StringUtils.isBlank(buildBed.getRealName())) {
+    public Result<Boolean> buildBed(BuildBedDetailVo buildBedDetailVo) {
+        if (StringUtils.isBlank(buildBedDetailVo.getRealName())) {
             //姓名
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (StringUtils.isBlank(buildBed.getGender())) {
+        if (StringUtils.isBlank(buildBedDetailVo.getGender())) {
             //性别
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (StringUtils.isBlank(buildBed.getCertiCode())) {
+        if (StringUtils.isBlank(buildBedDetailVo.getCertiCode())) {
             //身份证号
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (StringUtils.isBlank(buildBed.getAdressDetail())) {
+        if (StringUtils.isBlank(buildBedDetailVo.getAdressDetail())) {
             //家庭住址
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (buildBed.getNursingDemandLevel() != null && buildBed.getNursingDemandLevel() >= 1 && buildBed.getNursingDemandLevel() <= 5) {
+        if (buildBedDetailVo.getNursingDemandLevel() != null && buildBedDetailVo.getNursingDemandLevel() >= 1 && buildBedDetailVo.getNursingDemandLevel() <= 5) {
             //护理需求等级
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (StringUtils.isBlank(buildBed.getChanghuNo())) {
+        if (StringUtils.isBlank(buildBedDetailVo.getChanghuNo())) {
             //长护号
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (buildBed.getGuaranteeMode() != null && buildBed.getGuaranteeMode() >= 1 && buildBed.getGuaranteeMode() <= 3) {
+        if (buildBedDetailVo.getGuaranteeMode() != null && buildBedDetailVo.getGuaranteeMode() >= 1 && buildBedDetailVo.getGuaranteeMode() <= 3) {
             //保障方式
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
-        }*/
-        buildBed.setRecordTime(new Date());//建床时间
-        boolean b = buildBedService.save(buildBed);
-        return Result.success(b);
+        }
+        buildBedService.saveOrUpdateBuildBed(buildBedDetailVo);
+        return Result.success();
     }
 
     /**
@@ -190,5 +188,22 @@ public class BuildBedController {
         return Result.success();
 
     }
+
+    /**
+     * 失能人员信息修改申请详情页搜索失能人员接口
+     *
+     * @param pageNum  翻页参数
+     * @param pageSize 翻页参数
+     * @param realName 失能人员姓名
+     * @return 返回一组人员信息
+     */
+    @GetMapping("/buildBedSearchByRealName")
+    public Result<IPage<SearchDisableSimpleVo>> buildBedSearchByRealName(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, Integer srvOrganId, String realName) {
+        if (StringUtils.isBlank(realName) || null == srvOrganId) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        IPage<SearchDisableSimpleVo> searchDisableSimpleVoIPage = sendService.buildBedSearchByRealName(pageNum, pageSize,srvOrganId, realName);
+        return Result.success(searchDisableSimpleVoIPage);
+    }
 }
 

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvSendMapper.java

@@ -7,6 +7,7 @@ import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
+import com.hungraim.ltc.pojo.vo.disable.SearchDisableSimpleVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchRsp;
 import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
@@ -65,6 +66,23 @@ public interface SrvSendMapper extends BaseMapper<ChSrvSend> {
             "       on s.disab_info_id = i.disable_info_id" +
             "       where i.disable_info_id=#{disableInfoId}")
     List<DisableInfoTaskVO> selectTaskByDisableInfoId(Integer disableInfoId);
+
     @Select("SELECT max(srv_send_id) id from CH_SRV_SEND")
     Long selectMaxId();
+
+    @Select("SELECT " +
+            "t2.DISAB_INFO_ID," +
+            "t2.REAL_NAME," +
+            "t2.CERTI_CODE certifNum," +
+            "t2.BIRTHDAY," +
+            "t2.GENDER," +
+            "t2.TEL," +
+            "t2.DISE_TYPE_S " +
+            " FROM " +
+            "CH_SRV_SEND t1" +
+            " LEFT JOIN CH_DISABLE_INFO t2 ON t1.DISAB_INFO_ID = t2.DISAB_INFO_ID " +
+            " WHERE " +
+            "t1.SRV_ORGAN_ID = #{srvOrganId} " +
+            " AND t2.REAL_NAME LIKE CONCAT( '%', CONCAT( #{realName}, '%' ) )")
+    IPage<SearchDisableSimpleVo> buildBedSearchByRealName(Page<SearchDisableSimpleVo> page, Integer srvOrganId, String realName);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/IBuildBedService.java

@@ -2,6 +2,7 @@ package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
+import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
 
@@ -12,8 +13,5 @@ public interface IBuildBedService extends IService<ChSrvBuildBed> {
     Result searchOrgBed(BuildBedSearchReq req);
 
 
-
-
-
-
+    void saveOrUpdateBuildBed(BuildBedDetailVo buildBedDetailVo);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/SrvSendService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
+import com.hungraim.ltc.pojo.vo.disable.SearchDisableSimpleVo;
 import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
 import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
 
@@ -22,4 +23,5 @@ public interface SrvSendService extends IService<ChSrvSend> {
 
     Long selectMaxId();
 
+    IPage<SearchDisableSimpleVo> buildBedSearchByRealName(Integer pageNum, Integer pageSize, Integer srvOrganId, String realName);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java

@@ -167,7 +167,7 @@ public class AprOrganServiceImpl extends ServiceImpl<AprOrganMapper, ChAprOrgan>
             aprEmpMapper.updateById(chAprEmp);
             chAprEmp.setEmpId(chAprEmp.getEmpId());
         }
-        updateAttachs(chAprEmp.getFileDataList(), chAprEmp.getEmpId().longValue(), AttachType.APR_EMP.getUploadType());
+        updateAttachs(chAprEmp.getFileDataList(), chAprEmp.getEmpId().longValue(), AttachType.APR_ORGAN_EMP.getUploadType());
     }
 
     @Override
@@ -208,7 +208,7 @@ public class AprOrganServiceImpl extends ServiceImpl<AprOrganMapper, ChAprOrgan>
         //查询附件列表
         try {
             // 返回对应的附件列表  调用文件服务获取对应文件，出错或未获取到就只是相当于没有设置对应的数据，减少系统之间的耦合性
-            Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(aprEmpId, AttachType.APR_EMP.getUploadType());
+            Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(aprEmpId, AttachType.APR_ORGAN_EMP.getUploadType());
             if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
                 log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
             }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/BuildBedServiceImpl.java

@@ -2,40 +2,36 @@ package com.hungraim.ltc.governance.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.governance.dao.BuildBedMapper;
 import com.hungraim.ltc.governance.service.IBuildBedService;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
+import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
+import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
+import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.Result;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author jiaguokai
  */
 @Slf4j
 @Service
+@AllArgsConstructor
 public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildBed> implements IBuildBedService {
-    @Resource
-    private BuildBedMapper buildBedMapper;
+    private final BuildBedMapper buildBedMapper;
+    private final AttachFeignService attachFeignService;
 
     @Override
     public Result searchOrgBed(BuildBedSearchReq req) {
-//        QueryWrapper<ChSrvBuildBed> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("SRV_ORGAN_ID", req.getSrvOrganId());
-//        if (StrUtil.isNotBlank(req.getRealName())) {
-//            queryWrapper.like("REAL_NAME", req.getRealName());
-//        }
-//        if (StrUtil.isNotBlank(req.getCertiCode())) {
-//            queryWrapper.eq("CERTI_CODE", req.getCertiCode());
-//        }
-//        if (req.getStatus() != null && req.getStatus() != 2) {
-//            queryWrapper.eq("STATUS", req.getStatus());
-//        }
-//        Page<ChSrvBuildBed> page = buildBedMapper.selectPage(new Page<>(req.getPageNum(), req.getPageSize()), queryWrapper);
-
         if (2 == req.getStatus()) {
             req.setStatus(null);
         }
@@ -43,5 +39,32 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
         return Result.success(page);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveOrUpdateBuildBed(BuildBedDetailVo buildBedDetailVo) {
+        ChSrvBuildBed chSrvBuildBed = new ChSrvBuildBed();
+        BeanUtils.copyProperties(buildBedDetailVo, chSrvBuildBed);
+        List<ChFndAttach> fileDataList = buildBedDetailVo.getFileDataList();
+        chSrvBuildBed.setStatus(0); // 状态（0已建床，1已撤床）
+        chSrvBuildBed.setAccountStatus(0); // 结算状态（0，未结算；1，结算中；2，已结算）
+
+        this.updateAttachs(buildBedDetailVo);
+    }
+
+    /**
+     * 调用feign api来修改附件数据
+     *
+     * @param buildBedDetailVo
+     */
+    private void updateAttachs(BuildBedDetailVo buildBedDetailVo) {
+        // zhangch 20210525 新增附件修改逻辑
+        List<ChFndAttach> fileDataList = buildBedDetailVo.getFileDataList();
+        AttachUpdateVo attachUpdateVo = new AttachUpdateVo();
+        attachUpdateVo.setCtrlId(buildBedDetailVo.getBuildBedId().longValue());
+        attachUpdateVo.setAttachType(AttachType.BUILD_BED.getUploadType());
+        attachUpdateVo.setChFndAttachs(fileDataList);
+        attachFeignService.updateAttachs(attachUpdateVo);
+    }
+
 
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvSendServiceImpl.java

@@ -8,6 +8,7 @@ import com.hungraim.ltc.governance.service.SrvSendService;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
+import com.hungraim.ltc.pojo.vo.disable.SearchDisableSimpleVo;
 import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
 import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,5 +59,10 @@ public class SrvSendServiceImpl extends ServiceImpl<SrvSendMapper, ChSrvSend> im
         return this.baseMapper.selectMaxId();
     }
 
+    @Override
+    public IPage<SearchDisableSimpleVo> buildBedSearchByRealName(Integer pageNum, Integer pageSize, Integer srvOrganId, String realName) {
+        return sendMapper.buildBedSearchByRealName(new Page<SearchDisableSimpleVo>(pageNum, pageSize), srvOrganId, realName);
+    }
+
 
 }