Skip to content

L
long-tern-care-service
Commit 81f48e6a authored by zhangwanglin's avatar zhangwanglin
Browse files
Options

申请时间

parent c24cfb5e
Show whitespace changes
Inline Side-by-side
Showing with 147 additions and 11 deletions
apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml
View file @ 81f48e6a
......@@ -23,7 +23,8 @@
a.eff_time effTime,
a.data_from dataFrom,
a.APPLY_STATUS applyStatus,
a.APPLY_METHOD applyMethod
a.APPLY_METHOD applyMethod,
to_char(a.APPLY_TIME,'yyyy-MM-dd') applyTime
from CH_DISABLE_APPLY a
LEFT JOIN CH_FND_ORGAN o ON a.organ_id = o.ORGAN_ID
LEFT JOIN CH_CFG_SRV_MODE m ON a.srv_mode_id = m.MODE_ID
......@@ -122,7 +123,8 @@
a.REASONS_REMARK reasonsRemark,
a.MEDICAL_AREA medicalArea,
a.REVIEW_FREQUENCY reviewFrequency,
a.BANK_CARD_NO bankCardNo
a.BANK_CARD_NO bankCardNo,
to_char(a.APPLY_TIME,'yyyy-MM-dd') applyTime
from CH_DISABLE_APPLY a
LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
where a.APPLY_ID = #{applyId}
......
apply/apply-service/src/main/resources/mapper/DisableInfoMapper.xml
View file @ 81f48e6a
......@@ -73,7 +73,10 @@
<insert id="insertSrvSend">
<selectKey resultType="java.lang.Integer" order="BEFORE" keyProperty="id">
SELECT seq_ch_srv_send.NEXTVAL as id FROM DUAL
</selectKey>
insert INTO ch_srv_send(SRV_SEND_ID,DISAB_INFO_ID,FCD,STATUS) values
((SELECT max(srv_send_id)+1 id from CH_SRV_SEND),#{disableInfoId},SYSDATE,0)
(#{id},#{disableInfoId},SYSDATE,0)
</insert>
</mapper>
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableApply.java
View file @ 81f48e6a
package com.hungraim.ltc.pojo.entity.disable;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hungraim.ltc.pojo.entity.PageInfo;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import lombok.Data;
......@@ -643,6 +644,10 @@ public class ChDisableApply extends PageInfo implements Serializable {
private Date exitTime;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date applyTime;
@TableField(exist = false)
private List<ChFndAttach> fileDataList;
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableInfoChange.java
View file @ 81f48e6a
......@@ -4,7 +4,9 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
......@@ -425,4 +427,9 @@ public class ChDisableInfoChange {
*医保统筹区区
*/
private String medicalArea;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date applyTime;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvSend.java
View file @ 81f48e6a
......@@ -16,9 +16,9 @@ import java.util.List;
* CH_SRV_SEND
* @author
*/
@TableName("CH_SRV_SEND")
@Data
//@KeySequence("CH_SRV_SEND_SQE")
@TableName("CH_SRV_SEND")
@KeySequence("seq_ch_srv_send")
public class ChSrvSend implements Serializable {
/**
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExamineInfoVO.java
View file @ 81f48e6a
......@@ -131,5 +131,7 @@ public class DisableExamineInfoVO {
private String bankCardNo;
private String applyTime;
private List<ChFndAttach> fileDataList;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableUpdateDetailVO.java
View file @ 81f48e6a
......@@ -114,4 +114,9 @@ public class DisableUpdateDetailVO {
*医保统筹区
*/
private String medicalArea;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date applyTime;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableVO.java
View file @ 81f48e6a
......@@ -58,4 +58,6 @@ public class DisableVO implements Serializable {
private String status;
// 申请类别
private Integer applyMethod;
private String applyTime;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/PlaceOtherVO.java 0 → 100644
View file @ 81f48e6a
package com.hungraim.ltc.pojo.vo.disable;
import lombok.Data;
/**
* @author zwl
* @ClassName PlaceOtherVO
* @description
* @date 2023/3/24 16:02
**/
@Data
public class PlaceOtherVO {
private Integer disabInfoId;
private String realName;
private String certiCode;
private String riskLevel;
private String diseTypeS;
}
governance/src/main/java/com/hungraim/ltc/governance/controller/BuildBedController.java
View file @ 81f48e6a
......@@ -12,6 +12,7 @@ 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.PlaceOtherVO;
import com.hungraim.ltc.pojo.vo.disable.SearchDisableSimpleVo;
import com.hungraim.ltc.pojo.vo.governance.*;
import com.hungraim.ltc.util.Result;
......@@ -262,15 +263,17 @@ public class BuildBedController {
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);
// Long id = sendService.selectMaxId();
// if (id == null) {
// id = 0L;
// }
// chSrvSend.setSrvSendId(++id);
sendService.insertSrvSend(chSrvSend);
}else {
chSrvSend.setSrvSendId(chrSrvVo.getSrvSendId());
sendService.updateById(chSrvSend);
}
sendService.saveOrUpdate(chSrvSend);
}
} else {
return Result.failed("提交失败，参数为空");
......@@ -354,5 +357,26 @@ public class BuildBedController {
return Result.failed("删除失败");
}
}
@RequestMapping("/placeOtherQuery")
public Result<Page<PlaceOtherVO>> placeOtherQuery(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, String name, String certiCode) {
Page<PlaceOtherVO> page = new Page<>(pageNum, pageSize);
page = buildBedService.placeOtherQuery(page,name, certiCode);
return Result.success(page);
}
@RequestMapping("/placeOtherApply")
public Result placeOtherApply(Integer disabInfoId, String otherApplyTime) {
int result = buildBedService.placeOtherApply(disabInfoId, otherApplyTime);
if (result > 1) {
return Result.success();
}else {
return Result.failed("申请失败");
}
}
}
governance/src/main/java/com/hungraim/ltc/governance/dao/BuildBedMapper.java
View file @ 81f48e6a
......@@ -10,6 +10,7 @@ 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.disable.PlaceOtherVO;
import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchRsp;
import org.apache.ibatis.annotations.Mapper;
......@@ -27,6 +28,10 @@ import java.util.List;
@Repository
public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
int placeOtherApply(Integer disabInfoId, String otherApplyTime);
Page<PlaceOtherVO> placeOtherQuery(Page page, String name, String certiCode);
Page<BuildBedSearchRsp> searchOrgBed(Page<BuildBedSearchRsp> page, @Param("req") BuildBedSearchReq req);
IPage<DisableVO> disableList(String organId, String organname, String tel,
......
governance/src/main/java/com/hungraim/ltc/governance/service/IBuildBedService.java
View file @ 81f48e6a
......@@ -4,7 +4,9 @@ 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.assessment.TaskReportVO;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.PlaceOtherVO;
import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
import com.hungraim.ltc.util.Result;
......@@ -16,6 +18,11 @@ import java.util.Date;
* @author jiaguokai
*/
public interface IBuildBedService extends IService<ChSrvBuildBed> {
int placeOtherApply(Integer disabInfoId, String otherApplyTime);
Page<PlaceOtherVO> placeOtherQuery(Page page, String name, String certiCode);
Result searchOrgBed(BuildBedSearchReq req);
......
governance/src/main/java/com/hungraim/ltc/governance/service/SrvSendService.java
View file @ 81f48e6a
......@@ -24,4 +24,6 @@ public interface SrvSendService extends IService<ChSrvSend> {
Long selectMaxId();
IPage<SearchDisableSimpleVo> buildBedSearchByRealName(Integer pageNum, Integer pageSize, Integer srvOrganId, String realName);
int insertSrvSend(ChSrvSend chSrvSend);
}
governance/src/main/java/com/hungraim/ltc/governance/service/impl/BuildBedServiceImpl.java
View file @ 81f48e6a
......@@ -12,7 +12,9 @@ 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.assessment.TaskReportVO;
import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
import com.hungraim.ltc.pojo.vo.disable.PlaceOtherVO;
import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
......@@ -43,6 +45,18 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
private final ServiceTypeDetailedMapper serviceTypeDetailed;
@Override
public int placeOtherApply(Integer disabInfoId, String otherApplyTime) {
int result = buildBedMapper.placeOtherApply(disabInfoId,otherApplyTime);
return result;
}
@Override
public Page<PlaceOtherVO> placeOtherQuery(Page page, String name, String certiCode) {
Page<PlaceOtherVO> placeOtherVOPage = buildBedMapper.placeOtherQuery(page, name, certiCode);
return placeOtherVOPage;
}
@Override
public Result searchOrgBed(BuildBedSearchReq req) {
if (2 == req.getStatus()) {
req.setStatus(null);
......
governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvSendServiceImpl.java
View file @ 81f48e6a
......@@ -69,5 +69,10 @@ public class SrvSendServiceImpl extends ServiceImpl<SrvSendMapper, ChSrvSend> im
return sendMapper.buildBedSearchByRealName(new Page<>(pageNum, pageSize), srvOrganId, realName);
}
@Override
public int insertSrvSend(ChSrvSend chSrvSend) {
return this.baseMapper.insert(chSrvSend);
}
}
governance/src/main/resources/com/hungraim/ltc/governance/mapper/BuildBedMapper.xml
View file @ 81f48e6a
......@@ -160,4 +160,37 @@
LEFT JOIN CH_SERVICE_TYPE e ON d.PARA_ID = e.SERVICE_TYPE_ID
</select>
<select id="placeOtherQuery" resultType="com.hungraim.ltc.pojo.vo.disable.PlaceOtherVO">
SELECT distinct info.DISAB_INFO_ID disabInfoId,
report.evaluate_time evaluateTime,
task.ORGAN_ID organId,
report.disable_level_id disableLevelId,
info.REAL_NAME realName,
info.CERTI_CODE certiCode,
(SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
info.disease_desc diseaseDesc,
lev.DISABLE_LEVEL_NAME riskLevel,
report.PUBLICITY_START_TIME publicityStartTime,
report.PUBLICITY_END_TIME publicityEndTime,
report.PUBLICITY_TIME publicityTime
FROM CH_DISABLE_INFO info
LEFT JOIN CH_APR_TASK task ON info.DISAB_INFO_ID = task.DISABLE_INFO_ID
LEFT JOIN ch_apr_report report ON report.TASK_ID = task.TASK_ID
left join ch_apr_organ aprOrgan on task.apr_organ_id = aprOrgan.apr_organ_id
LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISABLE_LEVEL_ID
where info.SRV_MODE_ID ='4' and sysdate <![CDATA[ > ]]> report.PUBLICITY_END_TIME
<if test="name != null and name != ''">
and info.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
</if>
<if test="certiCode != null and certiCode != ''">
and info.CERTI_CODE =#{certiCode}
</if>
</select>
<update id="placeOtherApply">
update CH_DISABLE_INFO set OTHER_APPLY_TIME = #{otherApplyTime} where DISAB_INFO_ID = #{disabInfoId}
</update>
</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