Merge remote-tracking branch 'origin/master'

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvSend.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * CH_SRV_SEND
@@ -15,8 +17,9 @@ import java.util.Date;
  */
 @TableName("CH_SRV_SEND")
 @Data
-@KeySequence("CH_SRV_SEND_SQE")
+//@KeySequence("CH_SRV_SEND_SQE")
 public class ChSrvSend implements Serializable {
+
     /**
      * 服务分配ID
      */
@@ -41,6 +44,7 @@ public class ChSrvSend implements Serializable {
     /**
      * 分配时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date allotTime;
 
     /**
@@ -51,6 +55,7 @@ public class ChSrvSend implements Serializable {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date effTime;
 
     /**
@@ -61,11 +66,13 @@ public class ChSrvSend implements Serializable {
     /**
      * 终止时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
     /**
      * 首次操作时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date fcd;
 
     /**
@@ -76,6 +83,7 @@ public class ChSrvSend implements Serializable {
     /**
      * 末次操作时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date lcd;
 
     /**
@@ -91,6 +99,7 @@ public class ChSrvSend implements Serializable {
     /**
      * 服务分配终止时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date stopTime;
 
     /**

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChrSrvVo.java

+package com.hungraim.ltc.pojo.vo.disable;
+
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class ChrSrvVo extends ChSrvSend  {
+
+    private List<ChSrvSend> chSrvSends;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/DisableInfoTaskVO.java

@@ -26,5 +26,7 @@ public class DisableInfoTaskVO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reAprTime;
     private String permitId;
+    private String tel;
+    private Integer taskStatus;
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/DisableInfoVo.java

+package com.hungraim.ltc.pojo.vo.governance;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hungraim.ltc.pojo.entity.PageInfo;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class DisableInfoVo extends PageInfo {
+    //失能人员ID
+    private Integer disableInfoId;
+    //所在省市
+    private String provincial;
+    private String city;
+    private String area;
+    private String realName;
+    private String gender;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
+    //失能人员身份证号码
+    private String certiCode;
+    //失能人员手机号
+    private String tel;
+
+    //诊断疾病
+    private String disease;
+    //申请服务方式
+    private String srvModeName;
+
+    private Integer srvOrganIntent;
+    private String permitId;
+    //机构id
+    private Integer srvOrganId;
+
+    private Date aggign_time;
+
+    private Date endTime;
+
+    private Integer starts;
+
+    private String acptAddress;
+
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvSendVO.java

@@ -16,11 +16,13 @@ public class SrvSendVO  extends PageInfo implements Serializable {
     //id
     @TableId
     private Integer sendId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date stopTime;
     //失能人员ID
     private Integer disableInfoId;
     //适用机构
     private String organName;
-    //机构idsrv
+    //机构id
     private Integer srvOrganId;
     //机构代码
     private String organId;

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

 package com.hungraim.ltc.governance.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
 import com.hungraim.ltc.governance.service.*;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
+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.util.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -35,12 +42,13 @@ public class BuildBedController {
     private SrvSendService sendService;
     @Resource
     private CrvService crvService;
+    @Autowired
+    private DisableInfoServie disableInfoServie;
 
     @Resource
     private DisableEvaluateService disableEvaluateService;
 
 
-
     @PostMapping("/searchOrgBed")
     public Result searchOrgBed(@RequestBody BuildBedSearchReq req) {
         return buildBedService.searchOrgBed(req);
@@ -55,7 +63,7 @@ public class BuildBedController {
     /**
      * 功能描述: 服务分配信息检索条件查询
      */
-    @GetMapping("/pageFuwuCondition")
+    @PostMapping("/pageFuwuCondition")
     public Result pageFuwuCondition(ChDisableInfo disableInfo, ChSrvOrgan chSrvOrgan, ChSrvSend chSrvSend) {
 
         // 创建一个page对象
@@ -73,32 +81,29 @@ public class BuildBedController {
      * 根据id查询失能人员的评定信息
      */
     @PostMapping("/queryEvaluateById")
-    public Result queryEvaluateById (SrvSendVO srvSendVO){
+    public Result queryEvaluateById(SrvSendVO srvSendVO) {
         Integer disableInfoId = srvSendVO.getDisableInfoId();
         Integer srvOrganId = srvSendVO.getSrvOrganId();
-        if(StrUtil.isBlankIfStr(disableInfoId)){
+        if (StrUtil.isBlankIfStr(disableInfoId)) {
             return Result.failed("失能人员ID 为空！");
         }
-        if (StrUtil.isBlankIfStr(srvOrganId)){
+        if (StrUtil.isBlankIfStr(srvOrganId)) {
             return Result.failed("机构id不能为空");
         }
-
         DisableInfoTaskVO disableInfoTaskVO = sendService.selectTaskById(disableInfoId, srvOrganId);
-        List<ChAprTask> chAprTasks = sendService.selectBydisableInfoId(disableInfoId);
-
+        List<DisableInfoTaskVO> disableInfoTaskVO1 = sendService.selectBydisableInfoId(disableInfoId);
         Map map = new HashMap<>();
         map.put("disableInfoTaskVO", disableInfoTaskVO);
-        map.put("chAprTasks", chAprTasks);
+        map.put("chAprTasks", disableInfoTaskVO1);
         return Result.success(map);
     }
 
 
-
     /**
-     *护理机构及服务方式檢索
+     * 护理机构及服务方式檢索
      */
     @GetMapping("/PageCrv")
-    public Result PageCrv(HttpServletRequest request, ChSrvOrgan chSrvOrgan){
+    public Result PageCrv(HttpServletRequest request, ChSrvOrgan chSrvOrgan) {
         // 调用方法实现分页查询
         IPage<ChSrvOrgan> page = crvService.seletSrvOrganPage(chSrvOrgan);
         // 总记录数
@@ -111,36 +116,54 @@ public class BuildBedController {
     }
 
     /**
-     *提交分配机构
+     *已分配护理机构信息查询
+     */
+    @PostMapping("/querySrvYet")
+    public Result querySrvYet(DisableInfoVo disableInfoVo){
+        if (StrUtil.isBlankIfStr(disableInfoVo.getDisableInfoId())){
+            return Result.failed("失能人员id不能为空");
+        }
+        Page<DisableInfoVo> disableInfoVos = disableInfoServie.querySrvYet(disableInfoVo.getDisableInfoId(),disableInfoVo.getCurrent(),disableInfoVo.getLimit());
+        long total = disableInfoVos.getTotal();
+        List<DisableInfoVo> records = disableInfoVos.getRecords();
+        Map map = new HashMap<>();
+        map.put("total", total);
+        map.put("recors", records);
+        return Result.success(map);
+    }
+
+    /**
+     * 提交分配机构
      */
     @PostMapping("/submit")
-    public Result submit(@RequestParam(value = "chSrvSends",required = false)List<ChSrvSend>  chSrvSends ){
-        if(chSrvSends != null && chSrvSends.size()>0){
+    public Result submit(ChrSrvVo  chrSrvVo) {
+        List<ChSrvSend> chSrvSends = chrSrvVo.getChSrvSends();
+        if (chSrvSends != null && chSrvSends.size() > 0) {
             Long disabInfoId = null;
-            for (ChSrvSend chSrvSend: chSrvSends) {
+            for (ChSrvSend chSrvSend : chSrvSends) {
                 disabInfoId = chSrvSend.getDisabInfoId();
                 // 判斷參數是否存在
-                if (StrUtil.isBlankIfStr(chSrvSend.getDisabInfoId()) || StrUtil.isBlankIfStr(chSrvSend.getSrvOrganId()) || StrUtil.isBlankIfStr(chSrvSend.getSrvModeId())){
+                if (chSrvSend.getDisabInfoId()==null || chSrvSend.getSrvOrganId()==null || chSrvSend.getSrvModeId()==null) {
                     return Result.failed("参数不全！");
                 }
                 chSrvSend.setAllotTime(new Date());
                 chSrvSend.setStatus(Short.valueOf("1"));
+                if(chrSrvVo.getSrvSendId() == null){
+                    Long id = sendService.selectMaxId();
+                    if(id == null){
+                        id = 0l;
+                    }
+                    chSrvSend.setSrvSendId(++id);
+                }
                 sendService.saveOrUpdate(chSrvSend);
             }
-            ChDisableInfo disableInfo = new ChDisableInfo();
-            disableInfo.setDisabInfoId(disabInfoId);
-            IPage<SrvSendVO> page = sendService.selectPage(disableInfo,new ChSrvOrgan() , new ChSrvSend());
-            Map map = new HashMap();
-            map.put("total",page.getTotal());
-            map.put("rows",page.getRecords());
-            return Result.success(map);
-        }else{
+        } else {
             return Result.failed("提交失败，参数为空");
         }
-
-
+        return Result.success();
 
     }
 
+
 }
 

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import com.hungraim.ltc.pojo.vo.governance.DisableInfoVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
+
+
+    @Select("select s.real_name," +
+            "       s.acpt_provincial," +
+            "       s.acpt_city," +
+            "       s.acpt_area," +
+            "       s.gender," +
+            "       s.birthday," +
+            "       s.certi_code," +
+            "       s.tel," +
+            "       s.disease," +
+            "       i.srv_mode_id," +
+            "       s.srv_organ_intent," +
+            "       j.permit_id," +
+            "       j.srv_organ_name," +
+            "       i.allot_time," +
+            "       i.stop_time," +
+            "       i.status," +
+            "       i.acpt_address" +
+            "       from ch_srv_send i" +
+            "       left join ch_disable_info s " +
+            "       on s.disab_info_id = i.disab_info_id" +
+            "       left join ch_srv_organ j" +
+            "       on s.organ_id = j.organ_id" +
+            "       where i.disab_info_id=#{disableInfoId}")
+    Page<DisableInfoVo> querySrvYet(Page page,Integer disableInfoId);
+}

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

@@ -29,10 +29,11 @@ public interface SrvSendMapper extends BaseMapper<ChSrvSend> {
     Page<BuildBedSearchRsp> searchOrgBed(Page<BuildBedSearchRsp> page, @Param("req") BuildBedSearchReq req);
 
 
-    Page<SrvSendVO> selectSendList(Page<SrvSendVO> page, @Param("disableInfo")ChDisableInfo disableInfo, @Param("chSrvOrgan")ChSrvOrgan chSrvOrgan, @Param("chSrvSend")ChSrvSend chSrvSend);
+    Page<SrvSendVO> selectSendList(Page<SrvSendVO> page, @Param("disableInfo") ChDisableInfo disableInfo, @Param("chSrvOrgan") ChSrvOrgan chSrvOrgan, @Param("chSrvSend") ChSrvSend chSrvSend);
 
     @Select("select permit_id from ch_srv_organ where srv_organ_id=#{organId} ")
-    String selectByOrganId(Integer srvOrganId);
+    String selectByOrganId(Integer organId);
+
     @Select(" select s.real_name," +
             "        s.birthday," +
             "        s.medical_card," +
@@ -51,6 +52,19 @@ public interface SrvSendMapper extends BaseMapper<ChSrvSend> {
             "     on i.task_id = o.task_id  " +
             "   where s.disab_info_id=#{disableInfoId}")
     DisableInfoTaskVO selectBydisableInfoId(Integer disableInfoId);
-    @Select("select * from ch_apr_task where disable_info_id=#{disableInfoId}")
-    List<ChAprTask> selectTaskByDisableInfoId(Integer disableInfoId);
+
+    @Select("select s.real_name," +
+            "       s.certi_code," +
+            "       s.tel," +
+            "       s.disease," +
+            "       i.finish_time," +
+            "       i.re_apr_time," +
+            "       i.task_status" +
+            "       from ch_apr_task i" +
+            "       left join ch_disable_info s " +
+            "       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();
 }

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

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import com.hungraim.ltc.pojo.vo.governance.DisableInfoVo;
+
+
+
+public interface DisableInfoServie extends IService<ChDisableInfo> {
+
+
+    Page<DisableInfoVo> querySrvYet(Integer disableInfoId, int current, int limit);
+
+
+
+}

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

@@ -2,7 +2,6 @@ package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-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;
@@ -19,5 +18,8 @@ public interface SrvSendService extends IService<ChSrvSend> {
 
     DisableInfoTaskVO selectTaskById(Integer disableInfoId, Integer srvOrganId);
 
-    List<ChAprTask> selectBydisableInfoId(Integer disableInfoId);
+    List<DisableInfoTaskVO> selectBydisableInfoId(Integer disableInfoId);
+
+    Long selectMaxId();
+
 }

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

+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.governance.dao.DisableInfoMapper;
+import com.hungraim.ltc.governance.service.DisableInfoServie;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import com.hungraim.ltc.pojo.vo.governance.DisableInfoVo;
+import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class DisableInfoServieImpl extends ServiceImpl<DisableInfoMapper, ChDisableInfo> implements DisableInfoServie {
+
+
+    @Override
+    public Page<DisableInfoVo> querySrvYet(Integer disableInfoId, int current, int limit) {
+        Page<SrvSendVO> page = new Page<>(current,limit);
+        return this.baseMapper.querySrvYet(page,disableInfoId);
+    }
+}

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

@@ -13,8 +13,10 @@ import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
 import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -29,17 +31,18 @@ public class SrvSendServiceImpl extends ServiceImpl<SrvSendMapper, ChSrvSend> im
         Integer current = disableInfo.getCurrent();
         Integer limit = disableInfo.getLimit();
         if (current == null || current < 1) {
-            current =1;
+            current = 1;
         }
         if (limit == null || limit < 1) {
-            limit =1 ;
+            limit = 1;
         }
-        Page<SrvSendVO> page = new Page<>(current,limit);
+        Page<SrvSendVO> page = new Page<>(current, limit);
         return sendMapper.selectSendList(page, disableInfo, chSrvOrgan, chSrvSend);
 
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public DisableInfoTaskVO selectTaskById(Integer disableInfoId, Integer srvOrganId) {
         DisableInfoTaskVO disableInfoTaskVO = sendMapper.selectBydisableInfoId(disableInfoId);
         String s = sendMapper.selectByOrganId(srvOrganId);
@@ -48,8 +51,15 @@ public class SrvSendServiceImpl extends ServiceImpl<SrvSendMapper, ChSrvSend> im
     }
 
     @Override
-    public List<ChAprTask> selectBydisableInfoId(Integer disableInfoId) {
+    @Transactional(rollbackFor = Exception.class)
+    public List<DisableInfoTaskVO> selectBydisableInfoId(Integer disableInfoId) {
         return sendMapper.selectTaskByDisableInfoId(disableInfoId);
     }
 
+    @Override
+    public Long selectMaxId() {
+        return this.baseMapper.selectMaxId();
+    }
+
+
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvSend.xml

@@ -16,6 +16,7 @@
     <result column="tel" jdbcType="VARCHAR" property="tel"/>
     <result column="birthday" jdbcType="DATE" property="birthday"/>
     <result column="status" jdbcType="VARCHAR" property="status"/>
+    <result column="stop_time" jdbcType="VARCHAR" property="stopTime"/>
   </resultMap>
 
   <!--查询服务分配信息列表-->
@@ -32,6 +33,7 @@
         i.certi_code,
         i.gender,
         i.tel,
+        s.stop_time,
         i.birthday,
         s.status
      from ch_disable_info i