Skip to content

L
long-tern-care-service
Commit baa4b312 authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

评定报告录入列表

parent 78da3a59
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 126 deletions
assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
View file @ baa4b312
package com.hungraim.ltc.controller; package com.hungraim.ltc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO; import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
import com.hungraim.ltc.service.TaskService; import com.hungraim.ltc.service.TaskService;
import com.hungraim.ltc.util.Result; import com.hungraim.ltc.util.Result;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -57,37 +56,12 @@ public class TaskController { ...@@ -57,37 +56,12 @@ public class TaskController {
} }
/** /**
* 失能评定详情 * 评定报告录入列表
*
* @param evaluateId 评定id
* @return 失能审核信息详情
*/
@RequestMapping("/disableEvaluateInfo")
public Result<DisableEvaluateInfoVO> disableEvaluateInfo(String evaluateId) {
DisableEvaluateInfoVO disableEvaluateInfoVO = taskService.disableEvaluateInfo(evaluateId);
return Result.success(disableEvaluateInfoVO);
}
/**
* 失能评定
*
* @param applyId 申请id
* @param checkName 审核人
* @param applyStatus 审核结果
* @param checkRemark 审核备注
* @return 失能审核信息详情
*/
@RequestMapping("/disableEvaluate")
public Result disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark) {
return Result.success();
}
/**
* 新增失能评定
*/ */
@RequestMapping("/addAprTask") @RequestMapping("/taskReportList")
public Result addAprTask(ChAprTask chAprTask) { public Result<List<TaskReportVO>> taskReportList() {
return Result.success(); List<TaskReportVO> taskReportList = taskService.taskReportList();
return Result.success(taskReportList);
} }
} }
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java
View file @ baa4b312
...@@ -2,11 +2,9 @@ package com.hungraim.ltc.dao; ...@@ -2,11 +2,9 @@ package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.entity.eval.ChAprTask; import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO; import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -24,7 +22,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> { ...@@ -24,7 +22,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
/** /**
* 评定任务分配列表 * 评定任务分配列表
* *
* @param organIds 适用机构代码 * @param organIds 适用机构代码
* @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含 * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
* @param provincial 所在省 * @param provincial 所在省
* @param city 所在市 * @param city 所在市
...@@ -42,6 +40,9 @@ public interface TaskMapper extends BaseMapper<ChAprTask> { ...@@ -42,6 +40,9 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
String street, String realName, String certiCode, String taskName, String taskTel, String street, String realName, String certiCode, String taskName, String taskTel,
String daysRemaining, String status, String isReturn, String area); String daysRemaining, String status, String isReturn, String area);
DisableEvaluateInfoVO selectDisableEvaluateInfoByEvaluateId(String evaluateId); /**
* 评定报告录入
*/
List<TaskReportVO> taskReportList();
} }
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java
View file @ baa4b312
package com.hungraim.ltc.service; package com.hungraim.ltc.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO; import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* 失能评定Service * 失能评定Service
* *
...@@ -40,14 +40,7 @@ public interface TaskService { ...@@ -40,14 +40,7 @@ public interface TaskService {
int pageNum, int pageSize); int pageNum, int pageSize);
/** /**
* 失能评定详情 * 评定报告录入列表
*
* @param evaluateId 评定id
* @return 失能评定详情
*/ */
DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId); List<TaskReportVO> taskReportList();
void addEvaluate(ChAprTask disableEvaluate);
void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark);
} }
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java
View file @ baa4b312
...@@ -3,10 +3,9 @@ package com.hungraim.ltc.service.impl; ...@@ -3,10 +3,9 @@ package com.hungraim.ltc.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ltc.dao.TaskMapper; import com.hungraim.ltc.dao.TaskMapper;
import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO; import com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO;
import com.hungraim.ltc.pojo.vo.assessment.TaskReportVO;
import com.hungraim.ltc.service.TaskService; import com.hungraim.ltc.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -34,21 +33,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -34,21 +33,7 @@ public class TaskServiceImpl implements TaskService {
} }
@Override @Override
public DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId) { public List<TaskReportVO> taskReportList() {
return taskMapper.selectDisableEvaluateInfoByEvaluateId(evaluateId); return taskMapper.taskReportList();
} }
@Override
public void addEvaluate(ChAprTask disableEvaluate) {
taskMapper.insert(disableEvaluate);
}
@Override
public void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark) {
/*ChDisableApply chDisableApply = disableEvaluateList.selectById(applyId);
chDisableApply.setCheckName(checkName);
chDisableApply.setApplyStatus(applyStatus);
chDisableApply.setCheckRemark(checkRemark);*/
}
} }
\ No newline at end of file
assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml
View file @ baa4b312
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hungraim.ism.dao.DisableApplyMapper"> <mapper namespace="com.hungraim.ltc.dao.TaskMapper">
<select id="taskDistributionList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO"> <select id="taskDistributionList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO">
select select
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
(select DISTRICT_NAME from CH_FND_STREET street where disable.ACPT_AREA = street.STREET_CODE) acptStreet, (select DISTRICT_NAME from CH_FND_STREET street where disable.ACPT_AREA = street.STREET_CODE) acptStreet,
disable.end_time endTime, disable.end_time endTime,
emp.real_name empRealName, emp.real_name empRealName,
emp.tel emoTel, emp.tel empTel,
task.assign_time assignTime, task.assign_time assignTime,
task.accept_time acceptTime, task.accept_time acceptTime,
task.finish_time finishTime, task.finish_time finishTime,
...@@ -82,62 +82,28 @@ ...@@ -82,62 +82,28 @@
</where> </where>
</select> </select>
<select id="selectDisableEvaluateInfoByEvaluateId" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO"> <select id="taskReportList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskReportVO">
select a.organ_id organId, SELECT report.REPORT_ID reportId,
(select o1.organ_name from CH_FND_ORGAN o1 where a.organ_id = o1.organ_id) organName, task.APR_ORGAN_ID organId,
a.DISTRICT_PROVINCIAL provincial, organ.ORGAN_NAME organName,
a.DISTRICT_CITY city, (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
a.DISTRICT_AREA area, (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
a.REAL_NAME name, (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
a.CERTI_CODE certiCode, info.REAL_NAME realName,
a.BIRTHDAY birthday, info.CERTI_CODE certiCode,
a.GENDER gender, (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
a.TEL tel, (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
a.REGIST regist, info.tel tel,
a.FIXED_TEL fixedTel, (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial,
a.TREATMENT_TYPE treatmentType, (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
a.ACPT_PROVINCIAL acptProvincial, (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
a.ACPT_CITY acptCity, lev.RISK_LEVEL riskLevel,
a.ACPT_AREA acptArea, report.EFF_TIME effTime
a.ACPT_STREET acptStreet, FROM ch_apr_report report
a.ACPT_ADDRESS acptAddress, LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID
a.ACPT_SRV_PROVINCIAL acptSrvProvincial, LEFT JOIN CH_DISABLE_INFO info ON task.disable_info_id = info.disab_info_id
a.ACPT_SRV_CITY acptSrvCity, LEFT JOIN CH_APR_ORGAN organ ON task.APR_ORGAN_ID = organ.APR_ORGAN_ID
a.ACPT_SRV_AREA acptSrvArea, LEFT JOIN CH_DISABLE_RISK_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISA_RISK_LEVEL_ID
a.ACPT_SRV_STREET acptSrvStreet,
a.ACPT_SRV_ROAD_DETAIL acptSrvRoadDetail,
a.ADRESS_DISTRICT_PROVINCIAL adressDistrictProvincial,
a.ADRESS_DISTRICT_CITY adressDistrictCity,
a.ADRESS_DISTRICT_CODE adressDistrictCode,
a.ADDRESS_ROAD_DETAIL addressRoadDetail,
a.ADDRESS_NUMBER_DETAIL addressNumberDetail,
a.DISEASE disease,
a.APPLY_METHOD applyMethod,
a.DISEASE_DESC diseaseDesc,
a.MEDICAL_CARD medicalCard,
a.MEDICAL_TYPE medicalType,
a.SRV_ORGAN_ID srvOrganId,
o.PERMIT_ID permitId,
a.OPER_NAME operName,
a.OPER_CERTI_CODE operCertiCode,
a.OPER_TEL operTel,
a.OPER_RELATION operRelation,
a.OPER_FIXED_TEL operFixedTel,
a.OPER_DISTRICT_PROVINCE operDistrictProvince,
a.OPER_DISTRICT_CITY operDistrictCity,
a.OPER_DISTRICT_CODE operDistrictCode,
a.OPER_STREET operStreet,
a.OPER_ADDRESS operAddress,
a.CHECK_NAME checkName,
a.APPLY_STATUS applyStatus,
a.CHECK_REMARK checkRemark
from ch_disable_evaluate a,
CH_SRV_ORGAN o
where a.EVALUATE_ID = #{evaluateId}
and a.SRV_ORGAN_ID = o.organ_code
</select> </select>
</mapper> </mapper>
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskReportVO.java 0 → 100644
View file @ baa4b312
package com.hungraim.ltc.pojo.vo.assessment;
import lombok.Data;
@Data
public class TaskReportVO {
private String reportId;
private String organId;
private String organName;
private String districtProvincial;
private String districPity;
private String districtArea;
private String realName;
private String certiCode;
private String diseTypeF;
private String diseTypeS;
private String tel;
private String acptProvincial;
private String acptCity;
private String acptArea;
private String riskLevel;
private String effTime;
}
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