Skip to content

L
long-tern-care-service
Commit d7551ddc authored by 董天德's avatar 董天德
Browse files
Options

Merge remote-tracking branch 'origin/dev_20230224_打卡_马庆' into dev_ch_master

parents 2fe6aeb8 24fe0d32
Hide whitespace changes
Inline Side-by-side
Showing with 523 additions and 44 deletions
apply/apply-service/src/main/java/com/hungraim/ltc/controller/SrvOrganController.java
View file @ d7551ddc
......@@ -7,10 +7,7 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChCfgSrvOrganType;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndSrvOrganLevel;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpCate;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpType;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganListVo;
import com.hungraim.ltc.pojo.vo.disable.*;
import com.hungraim.ltc.pojo.vo.system.SrvOrganVo;
import com.hungraim.ltc.service.SrvEmpCateService;
import com.hungraim.ltc.service.SrvEmpTypeService;
......@@ -296,7 +293,7 @@ public class SrvOrganController {
*/
@GetMapping("/chSrvTaskDetailQuery")
public Result chSrvTaskDetailQuery(Integer pageNum, Integer pageSize,Long empId){
Page<ChSrvTaskDetailVo> page = new Page<>(pageNum, pageSize);
Page<ChSrvTaskDetail2Vo> page = new Page<>(pageNum, pageSize);
page = srvOrganEmpService.chSrvTaskDetailQuery(page,empId);
if(page.getSize()>0){
return Result.success(page);
......
apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvTaskDetailMapper.java
View file @ d7551ddc
......@@ -3,11 +3,10 @@ package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetail2Vo;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author mq
......@@ -21,7 +20,7 @@ public interface ChSrvTaskDetailMapper extends BaseMapper<ChSrvTaskDetail> {
* @param empId
* @return
*/
Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,Long empId);
Page<ChSrvTaskDetail2Vo> chSrvTaskDetailQuery(Page<ChSrvTaskDetail2Vo> page, Long empId);
}
......
apply/apply-service/src/main/java/com/hungraim/ltc/service/SrvOrganEmpService.java
View file @ d7551ddc
......@@ -2,6 +2,7 @@ package com.hungraim.ltc.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetail2Vo;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo;
......@@ -68,7 +69,7 @@ public interface SrvOrganEmpService {
Workbook srvOrganExport(Long organId,Long srvOrganId, Boolean isInvolveChild, String empName, String srvOrganName, String certifNum,
Short isLock, Short empType);
Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,Long empId);
Page<ChSrvTaskDetail2Vo> chSrvTaskDetailQuery(Page<ChSrvTaskDetail2Vo> page, Long empId);
int chSrvTaskDetailDelete(long taskDetailId,String userName);
}
apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/SrvOrganEmpServiceImpl.java
View file @ d7551ddc
......@@ -14,10 +14,7 @@ import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvempRiskLevel;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganEmp;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailDelete;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpExportVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo;
import com.hungraim.ltc.pojo.vo.disable.*;
import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
import com.hungraim.ltc.service.OrganService;
import com.hungraim.ltc.service.SrvOrganEmpService;
......@@ -36,6 +33,7 @@ import org.springframework.util.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Service
@AllArgsConstructor
......@@ -168,8 +166,18 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
}
@Override
public Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,Long empId) {
return chSrvTaskDetailMapper.chSrvTaskDetailQuery(page,empId);
public Page<ChSrvTaskDetail2Vo> chSrvTaskDetailQuery(Page<ChSrvTaskDetail2Vo> page, Long empId) {
Page<ChSrvTaskDetail2Vo> chSrvTaskDetailVoPage = chSrvTaskDetailMapper.chSrvTaskDetailQuery(page, empId);
chSrvTaskDetailVoPage.getRecords().stream().filter(chSrvTaskDetail -> {
if (null != chSrvTaskDetail.getSevStarTime()){
chSrvTaskDetail.setSevStarTime(chSrvTaskDetail.getSevStarTime().substring(0,19));
}
if (null != chSrvTaskDetail.getSevEndTime()){
chSrvTaskDetail.setSevEndTime(chSrvTaskDetail.getSevEndTime().substring(0,19));
}
return true;
}).collect(Collectors.toList());
return chSrvTaskDetailVoPage;
}
@Transactional(rollbackFor = Exception.class)
......
apply/apply-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml
View file @ d7551ddc
......@@ -56,12 +56,13 @@
AUDIT_RESULT, AUDIT_REMARK, AUDIT_DATE, ILLEGAL_TYPE, ILLEGAL_REMARK, ILLEGALRE_EMP,
ILLEGALRE_NAME, ILLEGALRE_TIME, ACCOUNT_SIGN, TASK_DETAIL_TYPE
</sql>
<select id="chSrvTaskDetailQuery" resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo">
<select id="chSrvTaskDetailQuery" resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetail2Vo">
SELECT
t.TASK_DETAIL_ID taskDetailId,
m.EMP_NAME empName,
m.ORGAN_ID orgamId,
T5.SRV_ORGAN_ID srvOrganId,
T5.SRV_ORGAN_NAME srvOrganName,
--t.STATUS status,
decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status,
t.SRV_START_TIME sevStarTime,
......@@ -70,6 +71,7 @@
CH_SRV_TASK_DETAIL t
LEFT JOIN CH_SRV_TASK k ON t.SRV_TASK_ID = k.SRV_TASK_ID
LEFT JOIN CH_SRV_ORGAN_EMP m ON m.EMP_ID = k.SRV_EMP_ID
LEFT JOIN CH_SRV_ORGAN T5 ON T5.SRV_ORGAN_ID = m.SRV_ORGAN_ID
WHERE m.EMP_ID = #{empId}
</select>
</mapper>
\ No newline at end of file
assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
View file @ d7551ddc
......@@ -252,7 +252,6 @@ public class TaskController {
}
ChAprReport newChAprReport = new ChAprReport();
Integer userId = TokenParsingUtil.TokenParsing(token, "userId");
System.out.println(chAprReport.getPublicityUser());
if(chAprReport.getPublicityUser() == null){
newChAprReport.setPublicityUser(userId);//当前登录人
newChAprReport.setPublicityTime(new Date());
......
auth-service/src/main/java/com/hungraim/ltc/controller/PublicKeyController.java
View file @ d7551ddc
package com.hungraim.ltc.controller;
import com.hungraim.ltc.util.CsoftSecurityUtil;
import com.hungraim.ltc.util.Result;
import com.nimbusds.jose.jwk.JWKSet;
import com.nimbusds.jose.jwk.RSAKey;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.security.KeyPair;
import java.security.interfaces.RSAPublicKey;
import java.util.Map;
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabDetailAccounts.java
View file @ d7551ddc
......@@ -26,12 +26,14 @@ public class ChDisabDetailAccounts implements Serializable {
private Long accountsDetailId;
private Long accountsId;
/**
* 失能人员id
*/
private String disabInfoId;
/**
* 护理机构id
*/
private String srvOrganId;
private String srvOrganId;
/**
* 创建时间
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChPunchDetailVO.java 0 → 100644
View file @ d7551ddc
package com.hungraim.ltc.pojo.entity.account;
import lombok.Data;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author mq
*/
@Data
@Component
public class ChPunchDetailVO {
/**
* 父类id
*/
private Long paraId;
/**
* 父类name
*/
private String serviceTypeName;
/**
* 项目信息
*/
private List<ChServiceTypeVO> serviceTypeVOS;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChPunchDetailsVO.java 0 → 100644
View file @ d7551ddc
package com.hungraim.ltc.pojo.entity.account;
import lombok.Data;
import java.util.List;
/**
* 打卡记录返回
* @author mq
*/
@Data
public class ChPunchDetailsVO {
/**
* 护理机构
*/
private String srvOrganName;
/**
* 护理类型
*/
private String organTypeName;
/**
* 项目信息
*/
private List<ChPunchDetailVO> recordData;
/**
* 打卡记录
*/
private List<ChServiceTypeDetailedVO> chPunchDetailVOS;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChServiceTypeDetailedVO.java 0 → 100644
View file @ d7551ddc
package com.hungraim.ltc.pojo.entity.account;
import lombok.Data;
/**
* @author mq
*/
@Data
public class ChServiceTypeDetailedVO {
/**
* 天数
*/
private String executionTime;
/**
* 服务类型名称
*/
private String itemName;
/**
* 服务类型明细id
*/
private String serviceTypeDetailedId;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChServiceTypeVO.java 0 → 100644
View file @ d7551ddc
package com.hungraim.ltc.pojo.entity.account;
import lombok.Data;
/**
* @author mq
*/
@Data
public class ChServiceTypeVO {
/**
* 服务类型id
*/
private Long serviceTypeDetailedId;
/**
* 服务类型名称
*/
private String serviceTypeDetailedName;
/**
* 父类id
*/
private Long paraId;
/**
* 父类name
*/
private String serviceTypeName;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetail2Vo.java 0 → 100644
View file @ d7551ddc
package com.hungraim.ltc.pojo.vo.disable;
import com.hungraim.ltc.pojo.vo.BaseReq;
import lombok.Data;
/**
* @author root
*/
@Data
public class ChSrvTaskDetail2Vo extends BaseReq {
private Long taskDetailId;
private String empName;
private Integer orgamId;
private String srvOrganId;
private String srvOrganName;
private String status;
private String sevStarTime;
private String sevEndTime;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetailVo.java
View file @ d7551ddc
package com.hungraim.ltc.pojo.vo.disable;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hungraim.ltc.pojo.vo.BaseReq;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author root
*/
@Data
public class ChSrvTaskDetailVo {
public class ChSrvTaskDetailVo extends BaseReq {
/**
* 打卡id
*/
private Long taskDetailId;
private String empName;
private Integer orgamId;
private String status;
private Date sevStarTime;
private Date sevEndTime;
/**
* 服务开始时间
*/
private String sevStarTime;
/**
* 服务结束时间
*/
private String sevEndTime;
/**
* 护理机构id
*/
private String srvOrganId;
/**
* 护理机构名称
*/
private String srvOrganName;
/**
* 失能人员id
*/
private String disabInfoId;
/**
* 失能人员姓名
*/
private String realName;
/**
* 失能人员身份证件号码
*/
private String certiCode;
/**
* 服务方式
*/
private String modeName;
}
common/common-core/src/main/java/com/hungraim/ltc/util/CsoftSecurityUtil.java
View file @ d7551ddc
......@@ -87,7 +87,6 @@ public class CsoftSecurityUtil {
String sign = sha256(receivedMap);
if (!sign.equals(inputSign)) {
// sign校验不通过，说明双方发送出的数据和对方收到的数据不一致
System.out.println("input sign: " + inputSign + ", calculated sign: " + sign);
return null;
}
......@@ -99,7 +98,6 @@ public class CsoftSecurityUtil {
// 解密data数据
String data = decryptAES(key, salt, receivedMap.get("data"));
System.out.println("接收到的data内容：" + data);
return data;
}
......@@ -131,7 +129,6 @@ public class CsoftSecurityUtil {
String salt = encryptRSA(externalPublicKey, aesIVWithBase64);
// 组织业务数据信息，并用上面生成的对称加密的密钥和IV进行加密
System.out.println("发送的data内容：" + sendData.toJSONString());
String cipherData = encryptAES(aesKeyWithBase64, aesIVWithBase64, sendData.toJSONString());
// 组织请求的key、value对
......
governance/src/main/java/com/hungraim/ltc/governance/controller/BuildBedController.java
View file @ d7551ddc
......@@ -4,9 +4,11 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.governance.service.*;
import com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO;
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.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.ChrSrvVo;
import com.hungraim.ltc.pojo.vo.disable.SearchDisableSimpleVo;
import com.hungraim.ltc.pojo.vo.governance.*;
......@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
......@@ -42,6 +45,7 @@ public class BuildBedController {
@Autowired
private IRemoveBedService removeBedService;
/**
* 建床管理列表
*/
......@@ -276,5 +280,49 @@ public class BuildBedController {
IPage<SearchDisableSimpleVo> searchDisableSimpleVoIPage = sendService.buildBedSearchByRealName(pageNum, pageSize, srvOrganId, realName);
return Result.success(searchDisableSimpleVoIPage);
}
/**
* 打卡查询
* @param
* @return
*/
@GetMapping("/chSrvTaskDetailQuery")
public Result chSrvTaskDetailQuery(ChSrvTaskDetailVo vo) throws ParseException {
Page<ChSrvTaskDetailVo> page = new Page<>(vo.getPageNum(), vo.getPageSize());
page = buildBedService.chSrvTaskDetailQuery(page,vo);
if(page.getSize()>0){
return Result.success(page);
}else {
return Result.failed(ResultCode.SRV_ORGAN_NOT_QUERY);
}
}
/**
* 打卡详情
* @param
* @return
*/
@GetMapping("/chPunchDetailsQuery")
public Result chPunchDetailsQuery(Long taskDetailId,String sevStarTime,String sevEndTime){
ChPunchDetailsVO chPunchDetailsVO = buildBedService.chPunchDetailsQuery(taskDetailId,sevStarTime,sevEndTime);
return Result.success(chPunchDetailsVO);
}
/**
* 删除打卡数据
* @param taskDetailId
* @param userName
* @return
*/
@PostMapping("/chSrvTaskDetailDelete")
public Result chSrvTaskDetailDelete(Long taskDetailId,String userName){
int srv = buildBedService.chSrvTaskDetailDelete(taskDetailId,userName);
if(srv>0){
return Result.success();
}else {
return Result.failed("删除失败");
}
}
}
governance/src/main/java/com/hungraim/ltc/governance/dao/BuildBedAttachs.java 0 → 100644
View file @ d7551ddc
package com.hungraim.ltc.governance.dao;
public interface BuildBedAttachs {
}
governance/src/main/java/com/hungraim/ltc/governance/dao/BuildBedMapper.java
View file @ d7551ddc
......@@ -3,6 +3,11 @@ package com.hungraim.ltc.governance.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO;
import com.hungraim.ltc.pojo.entity.account.ChServiceTypeDetailedVO;
import com.hungraim.ltc.pojo.entity.account.ChServiceTypeVO;
import com.hungraim.ltc.pojo.entity.disable.ChServiceTypeDetailed;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
......@@ -11,6 +16,9 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List;
/**
* @author jiaguokai
* ChSrvBuildBed
......@@ -25,4 +33,11 @@ public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
String srvmodename, String area, String city,
String certicode, String applystatus, int pageNum, int pageSize);
Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,@Param("vo") ChSrvTaskDetailVo vo);
ChPunchDetailsVO getsrvOrgan(Long taskDetailId);
List<ChServiceTypeDetailedVO> getServiceTypeDetailed(@Param("taskDetailId")Long taskDetailId,@Param("sevStarTime")String sevStarTime,@Param("sevEndTime")String sevEndTime);
List<ChServiceTypeVO> selectServiceTypeDetailed();
}
governance/src/main/java/com/hungraim/ltc/governance/service/IBuildBedService.java
View file @ d7551ddc
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.account.ChPunchDetailsVO;
import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
import com.hungraim.ltc.util.Result;
import java.text.ParseException;
import java.util.Date;
/**
* @author jiaguokai
*/
......@@ -22,4 +28,26 @@ public interface IBuildBedService extends IService<ChSrvBuildBed> {
* @return 返回建床详情
*/
BuildBedDetailVo getBuildBedDetail(Integer buildBedId);
/**
* 打卡查询
* @param page
* @param
* @return
*/
Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,ChSrvTaskDetailVo vo) throws ParseException;
/**
* 删除打卡数据
* @param taskDetailId
* @param userName
* @return
*/
int chSrvTaskDetailDelete(Long taskDetailId, String userName);
/**
* 打卡详情
* @param taskDetailId
*/
ChPunchDetailsVO chPunchDetailsQuery(Long taskDetailId,String sevStarTime,String sevEndTime);
}
governance/src/main/java/com/hungraim/ltc/governance/service/impl/BuildBedServiceImpl.java
View file @ d7551ddc
......@@ -4,9 +4,15 @@ 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.dao.ServiceTypeDetailedMapper;
import com.hungraim.ltc.governance.service.IBuildBedService;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.account.ChPunchDetailVO;
import com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO;
import com.hungraim.ltc.pojo.entity.account.ChServiceTypeDetailedVO;
import com.hungraim.ltc.pojo.entity.account.ChServiceTypeVO;
import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
......@@ -19,7 +25,10 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author jiaguokai
......@@ -31,6 +40,8 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
private final BuildBedMapper buildBedMapper;
private final AttachFeignService attachFeignService;
private final ServiceTypeDetailedMapper serviceTypeDetailed;
@Override
public Result searchOrgBed(BuildBedSearchReq req) {
if (2 == req.getStatus()) {
......@@ -72,6 +83,72 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
}
/**
* 打卡查询
* @param page
* @param
* @return
*/
@Override
public Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,ChSrvTaskDetailVo vo){
Page<ChSrvTaskDetailVo> chSrvTaskDetailVoPage = buildBedMapper.chSrvTaskDetailQuery(page, vo);
chSrvTaskDetailVoPage.getRecords().stream().filter(chSrvTaskDetail -> {
if (null != chSrvTaskDetail.getSevStarTime()){
chSrvTaskDetail.setSevStarTime(chSrvTaskDetail.getSevStarTime().substring(0,19));
}
if (null != chSrvTaskDetail.getSevEndTime()){
chSrvTaskDetail.setSevEndTime(chSrvTaskDetail.getSevEndTime().substring(0,19));
}
return true;
}).collect(Collectors.toList());
return chSrvTaskDetailVoPage;
}
/**
* 删除打卡数据
* @param taskDetailId
* @param userName
* @return
*/
@Override
public int chSrvTaskDetailDelete(Long taskDetailId, String userName) {
return buildBedMapper.deleteById(taskDetailId);
}
/**
* 打卡详情
* @param taskDetailId
*/
@Override
public ChPunchDetailsVO chPunchDetailsQuery(Long taskDetailId, String sevStarTime,String sevEndTime) {
List<ChPunchDetailVO> chPunchDetailVOS = new ArrayList<>();
//获取项目信息
List<ChServiceTypeVO> chServiceTypeDetaileds = buildBedMapper.selectServiceTypeDetailed();
log.info("chPunchDetailsQuery项目信息:"+chServiceTypeDetaileds);
Map<String, List<ChServiceTypeVO>> collects = chServiceTypeDetaileds.stream().collect(Collectors.groupingBy(ChServiceTypeVO::getServiceTypeName));
Iterator<Map.Entry<String, List<ChServiceTypeVO>>> iterator = collects.entrySet().iterator();
while (iterator.hasNext()){
Map.Entry<String, List<ChServiceTypeVO>> next = iterator.next();
ChPunchDetailVO chPunchDetailVO=new ChPunchDetailVO();
chPunchDetailVO.setServiceTypeName(next.getKey());
chPunchDetailVO.setServiceTypeVOS(next.getValue());
chPunchDetailVOS.add(chPunchDetailVO);
}
//获取服务机构和服务类型
ChPunchDetailsVO chPunchDetailsVO = buildBedMapper.getsrvOrgan(taskDetailId);
if(chPunchDetailsVO==null){
chPunchDetailsVO=new ChPunchDetailsVO();
}
log.info("chPunchDetailsQuery获取服务机构和服务类型:"+chPunchDetailsVO);
//打卡详情
List<ChServiceTypeDetailedVO> serviceTypeDetailed1s = buildBedMapper.getServiceTypeDetailed(taskDetailId,sevStarTime, sevEndTime);
log.info("chPunchDetailsQuery打卡详情:"+serviceTypeDetailed1s);
chPunchDetailsVO.setRecordData(chPunchDetailVOS);
chPunchDetailsVO.setChPunchDetailVOS(serviceTypeDetailed1s);
log.info("chPunchDetailsQuery:"+chPunchDetailsVO);
return chPunchDetailsVO;
}
/**
* 调用feign api来修改附件数据
*
* @param buildBedDetailVo 建床详情封装对象
......
governance/src/main/resources/com/hungraim/ltc/governance/mapper/BuildBedMapper.xml
View file @ d7551ddc
......@@ -24,4 +24,140 @@
</if>
ORDER BY a.BUILD_BED_TIME DESC, a.CERTI_CODE DESC
</select>
<select id="chSrvTaskDetailQuery" parameterType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo"
resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo">
SELECT
t.TASK_DETAIL_ID taskDetailId,
mode1.MODE_NAME modeName,----服务方式
organ.SRV_ORGAN_NAME srvOrganName,--护理机构名称
info.REAL_NAME realName,--失能人员名字
info.CERTI_CODE certiCode,--失能人员身份证件号码
t.SRV_START_TIME sevStarTime,--服务开始时间
t.SRV_END_TIME sevEndTime,--服务结束时间
TO_DATE( '', 'yyyy-MM-dd' ) declarationTime
FROM
CH_SRV_TASK_DETAIL t --服务明细表
LEFT JOIN ch_srv_task task ON task.srv_task_id = t.srv_task_id --服务计划详情
LEFT JOIN CH_DISABLE_INFO info ON task.DISAB_INFO_ID = info.DISAB_INFO_ID --失能人员信息表
LEFT JOIN ch_srv_program program ON task.program_id = program.program_id --服务方案
LEFT JOIN ch_srv_organ organ ON program.srv_organ_id = organ.srv_organ_id --服务机构
LEFT JOIN ch_cfg_srv_mode mode1 ON program.srv_mode_id = mode1.mode_id --服务方式
where 1=1
<if test="vo.srvOrganName != null and vo.srvOrganName != ''">
AND organ.SRV_ORGAN_NAME LIKE '%' || #{vo.srvOrganName} || '%'
</if>
<if test="vo.modeName != null and vo.modeName != ''">
AND mode1.MODE_NAME = #{vo.modeName}
</if>
<if test="vo.realName != null and vo.realName != ''">
AND info.REAL_NAME LIKE '%' || #{vo.realName} || '%'
</if>
<if test="vo.certiCode != null and vo.certiCode != ''">
AND info.CERTI_CODE =#{vo.certiCode}
</if>
<if test="vo.sevStarTime != null and vo.sevStarTime != ''">
AND t.SRV_START_TIME &gt;= TO_DATE (#{vo.sevStarTime}, 'yyyy-mm-dd')
</if>
<if test="vo.sevEndTime != null and vo.sevEndTime != ''">
AND t.SRV_END_TIME &lt;= TO_DATE (#{vo.sevEndTime}, 'yyyy-mm-dd')
</if>
UNION
SELECT
d.TASK_DETAIL_ID taskDetailId,
d.MODE_NAME modeName,----服务方式
o.SRV_ORGAN_NAME srvOrganName,--护理机构名称
info.REAL_NAME realName,--失能人员名字
info.CERTI_CODE certiCode,--失能人员身份证件号码
TO_DATE( '', 'yyyy-MM-dd' ) sevStarTime,--服务开始时间
TO_DATE( '', 'yyyy-MM-dd' ) sevEndTime,--服务结束时间
d.DECLARATION_TIME declarationTime--申报日期
FROM
CH_DISAB_ACCOUNTS_DETAIL d --账户信息表
LEFT JOIN CH_DISABLE_INFO info ON d.DISAB_INFO_ID = info.DISAB_INFO_ID --失能人员信息表
LEFT JOIN CH_SRV_ORGAN o ON d.SRV_ORGAN_ID = o.SRV_ORGAN_ID --护理机构表
where 1=1
<if test="vo.srvOrganName != null and vo.srvOrganName != ''">
AND o.SRV_ORGAN_NAME LIKE '%' || #{vo.srvOrganName} || '%'
</if>
<if test="vo.modeName != null and vo.modeName != ''">
AND d.MODE_NAME = #{vo.modeName}
</if>
<if test="vo.realName != null and vo.realName != ''">
AND info.REAL_NAME LIKE '%' || #{vo.realName} || '%'
</if>
<if test="vo.certiCode != null and vo.certiCode != ''">
AND info.CERTI_CODE =#{vo.certiCode}
</if>
<if test="vo.sevStarTime != null and vo.sevStarTime != ''">
AND d.DECLARATION_TIME &gt;= TO_DATE (#{vo.sevStarTime}, 'yyyy-mm-dd')
</if>
<if test="vo.sevEndTime != null and vo.sevEndTime != ''">
AND d.DECLARATION_TIME &lt;= TO_DATE (#{vo.sevEndTime}, 'yyyy-mm-dd')
</if>
</select>
<select id="getsrvOrgan" resultType="com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO">
SELECT
n.SRV_ORGAN_NAME srvOrganName,
e.ORGAN_TYPE_NAME organTypeName
FROM
CH_SRV_ORGAN n
LEFT JOIN CH_CFG_SRV_ORGAN_TYPE e ON n.ORGAN_ID = e.ORGAN_TYPE_ID
LEFT JOIN CH_DISAB_ACCOUNTS_DETAIL detail ON n.SRV_ORGAN_ID = detail.SRV_ORGAN_ID
WHERE detail.TASK_DETAIL_ID = #{taskDetailId}
</select>
<select id="getServiceTypeDetailed" parameterType="Long" resultType="com.hungraim.ltc.pojo.entity.account.ChServiceTypeDetailedVO">
SELECT
to_char( detail.DECLARATION_TIME, 'dd' ) executionTime,
service.SERVICE_TYPE_DETAILED_NAME itemName,
service.SERVICE_TYPE_DETAILED_ID serviceTypeDetailedId
FROM
CH_DISAB_ACCOUNTS_DETAIL detail
LEFT JOIN CH_SRV_TASK_FINISH_ITEM item ON detail.TASK_DETAIL_ID = item.TASK_DETAIL_ID
LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = item.ITEM_ID
left join CH_SERVICE_TYPE_DETAILED service on service.SERVICE_TYPE_DETAILED_ID = CSOP.ITEM_NAME
WHERE 1=1
<if test="taskDetailId != null and taskDetailId != ''">
and detail.TASK_DETAIL_ID = #{taskDetailId}
</if>
<if test="sevStarTime != null and sevStarTime != ''">
AND detail.DECLARATION_TIME &gt;= TO_DATE (substr(#{sevStarTime} ,1,10), 'yyyy-mm-dd')
</if>
<if test="sevEndTime != null and sevEndTime != ''">
AND detail.DECLARATION_TIME &lt;= TO_DATE (substr(#{sevEndTime},1,10), 'yyyy-mm-dd')
</if>
UNION
SELECT
to_char( detail.SRV_START_TIME, 'dd' ) executionTime,
service.SERVICE_TYPE_DETAILED_NAME itemName,
service.SERVICE_TYPE_DETAILED_ID serviceTypeDetailedId
FROM
CH_SRV_TASK_DETAIL detail
LEFT JOIN CH_SRV_TASK_FINISH_ITEM item ON detail.TASK_DETAIL_ID = item.TASK_DETAIL_ID
LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = item.ITEM_ID
left join CH_SERVICE_TYPE_DETAILED service on service.SERVICE_TYPE_DETAILED_ID = CSOP.ITEM_NAME
WHERE 1=1
<if test="taskDetailId != null and taskDetailId != ''">
and detail.TASK_DETAIL_ID = #{taskDetailId}
</if>
<if test="sevStarTime != null and sevStarTime != ''">
AND detail.SRV_START_TIME &gt;= TO_DATE (substr(#{sevStarTime},1,10), 'yyyy-mm-dd')
</if>
<if test="sevEndTime != null and sevEndTime != ''">
AND detail.SRV_END_TIME &lt;= TO_DATE (substr(#{sevEndTime},1,10), 'yyyy-mm-dd')
</if>
</select>
<select id="selectServiceTypeDetailed" resultType="com.hungraim.ltc.pojo.entity.account.ChServiceTypeVO">
SELECT
d.SERVICE_TYPE_DETAILED_ID,
d.SERVICE_TYPE_DETAILED_NAME,
d.PARA_ID,
e.SERVICE_TYPE_NAME
FROM
CH_SERVICE_TYPE_DETAILED d
LEFT JOIN CH_SERVICE_TYPE e ON d.PARA_ID = e.SERVICE_TYPE_ID
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment