Skip to content

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

测试问题修改

parent 1a235765
Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 165 deletions
apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvOrganEmpMapper.java
View file @ 4963d527
......@@ -3,11 +3,9 @@ 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.ChSrvOrganEmp;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpExportVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
......
apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java
View file @ 4963d527
......@@ -116,8 +116,23 @@ public class DisableServiceImpl implements DisableService {
if (StrUtil.isNotBlank(organId)) {
organIds = Arrays.asList(organId.split(","));
}
return disableApplyMapper.disableList(page, organIds, districtProvincial,
Page<DisableVO> disableVOPage = disableApplyMapper.disableList(page, organIds, districtProvincial,
districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, applyMethod);
List<DisableVO> records = disableVOPage.getRecords();
for (DisableVO record : records) {
String birthday = record.getBirthday();
if(StringUtils.isNotEmpty(birthday)) {
Date birthdayDate = DateUtils.strToDate(birthday);
try {
int age = DateUtils.getAge(birthdayDate);
record.setAge(age);
} catch (Exception e) {
e.printStackTrace();
}
}
}
return disableVOPage;
}
@Transactional(rollbackFor = Exception.class)
......@@ -567,12 +582,18 @@ public class DisableServiceImpl implements DisableService {
districtCity, districtArea, realName, certiCode, dataFrom, applyMethod);
for (DisableExportVO record : records) {
StringBuilder stringBuilder = new StringBuilder();
if(record.getProvincial().equals(record.getCity())){
stringBuilder.append(record.getProvincial());
}else {
stringBuilder.append(record.getProvincial()).append(record.getCity());
}
stringBuilder.append(record.getProvincial()).append(record.getCity()).append(record.getArea());
record.setProvinCialcityArea(stringBuilder.toString());
String birthday = record.getBirthday();
if(StringUtils.isNotEmpty(birthday)) {
Date birthdayDate = DateUtils.strToDate(birthday);
try {
int age = DateUtils.getAge(birthdayDate);
record.setAge(age);
} catch (Exception e) {
e.printStackTrace();
}
}
}
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF); // 对应xlsx
......
apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/SrvOrganEmpServiceImpl.java
View file @ 4963d527
......@@ -143,21 +143,6 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
Short isLock, Short empType) {
List<Long> organIds = organService.getOrganIds(organId, isInvolveChild);
List<SrvOrganEmpExportVo> srvOrganEmpExportList = chSrvOrganEmpMapper.getSrvOrganEmpExportList(organIds,srvOrganId, empName, srvOrganName, certifNum, isLock, empType);
// for (SrvOrganEmpExportVo record : srvOrganEmpExportList) {
// StringBuilder stringBuilder = new StringBuilder();
// if(record == null){
// break;
// }
// if(StringUtils.isEmpty(record.getProvincial())){
// stringBuilder.append("--");
// }else if( record.getProvincial().equals(record.getCity())){
// stringBuilder.append(record.getProvincial());
// }else {
// stringBuilder.append(record.getProvincial()).append(record.getCity());
// }
// record.setProvinCialcityArea(stringBuilder.toString());
// }
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF); // 对应xlsx
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, SrvOrganEmpExportVo.class, srvOrganEmpExportList);
......
apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml
View file @ 4963d527
......@@ -10,7 +10,7 @@
a.DISTRICT_CITY city,
a.DISTRICT_AREA area,
a.REAL_NAME name,
a.birthday birthday,
to_char(a.birthday,'yyyy-MM-dd') birthday,
a.CERTI_CODE certiCode,
a.TREATMENT_TYPE treatmentTyte,
a.OPER_NAME operName,
......@@ -182,12 +182,14 @@
<select id="disableExportList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableExportVO">
select a.APPLY_ID applyId,
o.ORGAN_NAME organName,
o.organ_name fndOrganName,
a.organ_id organId,
(select dis.district_name from ch_fnd_district dis where a.DISTRICT_PROVINCIAL = dis.district_code) provincial,
(select dis.district_name from ch_fnd_district dis where a.DISTRICT_CITY = dis.district_code) city,
(select dis.district_name from ch_fnd_district dis where a.district_area = dis.district_code) area,
a.DISTRICT_AREA area,
a.REAL_NAME name,
a.birthday birthday,
to_char(a.birthday,'yyyy-MM-dd') birthday,
a.CERTI_CODE certiCode,
a.TREATMENT_TYPE treatmentTyte,
a.OPER_NAME operName,
......@@ -196,10 +198,9 @@
a.tel tel,
a.fixed_tel fixedTel,
m.MODE_NAME srvModeName,
a.DISE_TYPE_S diseTypeS,
(select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where a.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
to_char(a.eff_time,'yyyy-MM-dd HH24:mi:ss') effTime,
DECODE(a.data_from, '1','核心','2', '手机端','3', '待遇申请') dataFrom,
a.APPLY_STATUS applyStatus,
decode(a.APPLY_STATUS,'1','待审核','2','审核通过','3','审核不通过') applyStatus,
a.APPLY_METHOD applyMethod
from CH_DISABLE_APPLY a
LEFT JOIN CH_FND_ORGAN o ON a.organ_id = o.ORGAN_ID
......
apply/apply-service/src/main/resources/mapper/ChSrvOrganEmpMapper.xml
View file @ 4963d527
......@@ -101,13 +101,13 @@
T1.EMP_NAME empName,
DECODE(T1.gender, 'M','男','F', '女','N', '不确定') gender,
T1.AGE age,
T1.CERTIF_TYPE certifType,
( case T1.CERTIF_TYPE when '1' then '身份证' else '未知' end ) certifType,
T1.CERTIF_NUM certifNum,
T1.MOBILE_PHONE mobilePhone,
T1.EMP_TYPE_ID empTypeId,
T1.EDU_ID eduId,
T1.EMP_TYPE empType,
T1.IS_LOCK isLock,
education.EDU_CODE eduId,
DECODE(T1.EMP_TYPE,'0','护理人员','1','管理人员') empType,
emptype.TYPE_NAME empTypeId,
DECODE(T1.IS_LOCK,'0','有效','1','失效') isLock,
T1.EFF_TIME effTime,
(select dis.district_name from ch_fnd_district dis where T4.DISTRICT_PROVINCIAL = dis.district_code) provincial,
(select dis.district_name from ch_fnd_district dis where T4.DISTRICT_CITY = dis.district_code) city,
......@@ -117,6 +117,9 @@
FROM CH_SRV_ORGAN_EMP T1
LEFT JOIN CH_SRV_ORGAN T4 ON T1.SRV_ORGAN_ID = T4.SRV_ORGAN_ID
LEFT JOIN CH_FND_ORGAN T5 ON T1.ORGAN_ID = T5.ORGAN_ID
left join CH_CFG_SRV_EMP_TYPE emptype on T1.emp_type_id = emptype.EMP_TYPE_ID--护理人员资质
--学历表
LEFT JOIN CH_FND_EDUCATION education ON T1.EDU_ID = education.EDU_ID
<where>
<if test="organIds != null and organIds.size() > 0">
AND T1.ORGAN_ID IN
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
View file @ 4963d527
......@@ -2,7 +2,6 @@ package com.hungraim.ltc.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.dao.AprReportMapper;
......@@ -84,9 +83,9 @@ public class TaskController {
* @param tel 失能人员手机号码
*/
@RequestMapping("/taskReportList")
public Result<Page<TaskReportVO>> taskReportList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,String name, String certiCode, String tel) {
public Result<Page<TaskReportVO>> taskReportList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,String name, String certiCode, String tel,String riskLevel,Integer evaluateType) {
Page<TaskReportVO> page = new Page<>(pageNum, pageSize);
page = taskService.taskReportList(page,name, certiCode, tel);
page = taskService.taskReportList(page,name, certiCode, tel,riskLevel,evaluateType);
log.info("评定报告录入："+JSONObject.toJSONString(page));
return Result.success(page);
}
......@@ -685,25 +684,7 @@ public class TaskController {
return Result.failed("没有查到日常生活活动能力数据");
}
/**
* 评定人员导出
*
* @param provincial 失能人员所在省
* @param city 失能人员所在市
* @param area 失能人员所在区
* @param organName 评定机构名称
* @param realName 评定人员姓名
* @param tel 评定人员手机号码
* @param groupLeader 是否组长0组长，1非组长
*/
@GetMapping("/aprEmpExport")
public void aprEmpExport(String provincial, String city, String area, String organName, String realName, String tel, String certiCode,String isLock,String empType,String groupLeader,HttpServletResponse response){
Workbook workbook = taskService.aprEmpExport(provincial, city, area, organName, realName,
tel,certiCode,isLock,empType, groupLeader);
// 命名表格
String fileName = "aprEmp.xlsx";
FileUtils.exportResponse(workbook,fileName,response);
}
/**
* 查询评估结算列表
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java
View file @ 4963d527
......@@ -56,7 +56,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
/**
* 评定报告录入列表
*/
Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel,String riskLevel,Integer evaluateType);
TaskReportVO getReportById(String reportId);
......@@ -76,7 +76,6 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
Page<TaskGroupInfoByPageVO> taskGroupInfoListByPage(String aprEmpId, String appointStartTime, String appointEndTime, String queryBeginDate, String queryEndDate, String groupNo, Integer pageNo, Integer pageSize);
List<AprEmpExportVO> aprEmpExportList(String provincial, String city, String area, String organName, String name, String tel, String certiCode,String isLock,String empType, String groupLeader);
int insertSrvSend(Integer disableInfoId);
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java
View file @ 4963d527
......@@ -3,7 +3,10 @@ package com.hungraim.ltc.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.assessment.*;
import com.hungraim.ltc.pojo.entity.assessment.ChAprReport;
import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
import com.hungraim.ltc.pojo.entity.assessment.ChAssessDetailAccountsResp;
import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
import com.hungraim.ltc.pojo.vo.ReportUpdateVO;
import com.hungraim.ltc.pojo.vo.account.AssessAccountsListResp;
......@@ -28,7 +31,7 @@ public interface TaskService {
String street, String realName, String certiCode, String taskName, String taskTel,
String daysRemaining, String taskStatus, String isReturn, String area,int type);
Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel,String riskLevel,Integer evaluateType);
List<AprEmpVO> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);
......@@ -88,7 +91,6 @@ public interface TaskService {
Map taskReportFractionDtlQueryList();
Workbook aprEmpExport(String provincial, String city, String area, String organName, String name, String tel, String certiCode,String isLock,String empType, String groupLeader);
void assessAccount(ReportDetailVO reportDetailVo);
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java
View file @ 4963d527
......@@ -14,10 +14,7 @@ import com.hungraim.ltc.dao.*;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.assessment.*;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
import com.hungraim.ltc.pojo.vo.ReportUpdateVO;
import com.hungraim.ltc.pojo.vo.account.AssessAccountsExportResp;
import com.hungraim.ltc.pojo.vo.account.AssessAccountsListResp;
......@@ -29,7 +26,6 @@ import com.hungraim.ltc.service.TppesApiException;
import com.hungraim.ltc.util.*;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.expression.LongValue;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
......@@ -119,8 +115,8 @@ public class TaskServiceImpl implements TaskService {
* @param tel 失能人员手机号码
*/
@Override
public Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel) {
return taskMapper.taskReportList(page,name, certiCode, tel);
public Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel,String riskLevel,Integer evaluateType) {
return taskMapper.taskReportList(page,name, certiCode, tel,riskLevel,evaluateType);
}
/**
......@@ -889,25 +885,7 @@ public class TaskServiceImpl implements TaskService {
return typeHashMap;
}
@Override
public Workbook aprEmpExport(String provincial, String city, String area, String organName, String name, String tel, String certiCode,String isLock,String empType, String groupLeader) {
List<AprEmpExportVO> aprEmpExportList = taskMapper.aprEmpExportList(provincial, city, area, organName, name, tel,certiCode, isLock,empType, groupLeader);
for (AprEmpExportVO record : aprEmpExportList) {
StringBuilder stringBuilder = new StringBuilder();
if(org.springframework.util.StringUtils.isEmpty(record.getDistrictProvincial())){
stringBuilder.append("--");
}else if( record.getDistrictProvincial().equals(record.getDistrictCity())){
stringBuilder.append(record.getDistrictProvincial());
}else {
stringBuilder.append(record.getDistrictProvincial()).append(record.getDistrictCity());
}
record.setDistrictProvincial(stringBuilder.toString());
}
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF); // 对应xlsx
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, AprEmpExportVO.class, aprEmpExportList);
return workbook;
}
@Override
......
assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml
View file @ 4963d527
......@@ -223,6 +223,13 @@
<if test="tel != null and tel != ''">
and info.tel = #{tel}
</if>
<if test="riskLevel != null and riskLevel != ''">
and lev.DISABLE_LEVEL_ID = #{riskLevel}
</if>
<if test="evaluateType != null">
and report.EVALUATE_TYPE = #{evaluateType}
</if>
</where>
</select>
......@@ -480,61 +487,6 @@
<select id="aprEmpExportList" resultType="com.hungraim.ltc.pojo.vo.assessment.AprEmpExportVO">
SELECT emp.emp_id empId,
srvOrgan.srv_organ_name srvOrganName,
organ.organ_code organCode,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) districtCity,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
organ.organ_name organName,
o.organ_name fndOrganName,
organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
emp.real_name realName,
DECODE(emp.gender, 'M','男','F', '女','N', '不确定') gender,
emp.AGE age,
emp.certi_code certiCode,
emp.tel tel,
DECODE(emp.EMP_TYPE, '0','评定人员','1', '管理人员'，'2','医生','3','护士') empType,
DECODE(emp.Group_leader, '0','组长','1', '非组长') groupLeader,
DECODE(emp.IS_LOCK, '0','有效','1', '失效') isLock
FROM ch_apr_emp emp
LEFT JOIN ch_apr_organ organ ON emp.apr_organ_id = organ.apr_organ_id
LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.srv_organ_id
LEFT JOIN ch_fnd_organ o ON o.organ_id = srvOrgan.organ_id
<where>
<if test="provincial != null and provincial != ''">
and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}
</if>
<if test="city != null and city != ''">
and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) = #{city}
</if>
<if test="area != null and area != ''">
and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) = #{area}
</if>
<if test="organName != null and organName != ''">
and organ.organ_name like CONCAT(CONCAT('%',#{organName}) ,'%')
</if>
<if test="name != null and name != ''">
and emp.real_name like CONCAT(CONCAT('%',#{name}) ,'%')
</if>
<if test="certiCode != null and certiCode != ''">
and emp.certi_code = #{certiCode}
</if>
<if test="tel != null and tel != ''">
and emp.tel = #{tel}
</if>
<if test="groupLeader != null and groupLeader != ''">
and emp.group_leader = #{groupLeader}
</if>
<if test="empType != null and empType != ''">
and emp.emp_type = #{empType}
</if>
<if test="isLock != null and isLock != ''">
and emp.is_lock = #{isLock}
</if>
</where>
</select>
<insert id="insertSrvSend">
insert INTO ch_srv_send(SRV_SEND_ID,DISAB_INFO_ID,FCD,STATUS) values
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AprEmpExportVO.java
View file @ 4963d527
......@@ -17,14 +17,11 @@ public class AprEmpExportVO {
@Excel(name = "适用机构",width = 20)
private String fndOrganName;
@Excel(name = "所在省市",width = 20)
private String districtProvincial;
/* @Excel(name = "所在省市",width = 20)
private String districtProvincial;*/
@Excel(name = "评定机构名称",width = 20)
private String organName;
//
@Excel(name = "统一社会信用代码",width = 20)
private String unifiedSocialCreditCode;
@Excel(name = "评定人员名称",width = 20)
private String realName;
......@@ -32,14 +29,26 @@ public class AprEmpExportVO {
@Excel(name = "评定人员性别")
private String gender;
@Excel(name = "评定人员年龄")
private String age;
@Excel(name = "评定人员身份证号码",width = 20)
@Excel(name = "评定人员证件类型",width = 20)
private String certifTypeId;
@Excel(name = "评定人员证件号码",width = 20)
private String certiCode;
@Excel(name = "评定人员手机号码",width = 20)
private String tel;
/* //
@Excel(name = "统一社会信用代码",width = 20)
private String unifiedSocialCreditCode;*/
@Excel(name = "评定人员资质",width = 20)
private String aprempTypeS;
@Excel(name = "人员类型",width = 20)
private String empType;
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExportVO.java
View file @ 4963d527
......@@ -15,7 +15,11 @@ import java.io.Serializable;
@Data
public class DisableExportVO implements Serializable {
@Excel(name = "所在省市")
@Excel(name = "适用机构",width = 20)
private String fndOrganName;
@Excel(name = "所在省市",width = 20)
private String provinCialcityArea;
@Excel(name = "失能人员姓名",width = 20)
......@@ -24,7 +28,10 @@ public class DisableExportVO implements Serializable {
@Excel(name = "性别")
private String gender;
@Excel(name = "出生日期",exportFormat = "yyyy-MM-dd",width = 15)
//@Excel(name = "出生日期",exportFormat = "yyyy-MM-dd",width = 15)
@Excel(name = "年龄")
private int age;
private String birthday;
@Excel(name = "失能人员身份证号码",width = 25)
......@@ -36,19 +43,21 @@ public class DisableExportVO implements Serializable {
@Excel(name = "申请服务方式")
private String srvModeName;
/* @Excel(name = "诊断疾病" ,width = 20)
private String disease;*/
@Excel(name = "诊断疾病" ,width = 20)
private String diseTypeS;
@Excel(name = "申请时间" ,width = 20)
private String effTime;
/* @Excel(name = "申请来源")
private String dataFrom;*/
@Excel(name = "状态")
private String applyStatus;
private String provincial;
private String city;
private String area;
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableVO.java
View file @ 4963d527
......@@ -30,8 +30,10 @@ public class DisableVO implements Serializable {
//联系人姓名
private String opername;
//年龄
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
/* @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;*/
private String birthday;
private int age;
//性别
private String gender;
//失能人员身份证号码
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/SrvOrganEmpExportVo.java
View file @ 4963d527
......@@ -36,21 +36,29 @@ public class SrvOrganEmpExportVo {
@Excel(name = "护理人员年龄")
private String age;
@Excel(name = "护理人员证件类型",width = 20)
private String certifType;
@Excel(name = "护理人员证件号码",width = 20)
private String certifNum;
@Excel(name = "护理人员手机号码" ,width = 20)
private String mobilePhone;
/* @Excel(name = "联系人姓名",width = 20)
private String linkName;*/
@Excel(name = "护理人员资质" ,width = 20)
private String empTypeId;
@Excel(name = "文件水平",width = 20)
private String eduId;
@Excel(name = "人员类型",width = 20)
private String empType;
@Excel(name = "联系人电话",width = 20)
private String linkTel;
@Excel(name = "状态",width = 20)
private String isLock;
@Excel(name = "床位数")
private String bunk;
private String provincial;
......
governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java
View file @ 4963d527
......@@ -12,13 +12,16 @@ import com.hungraim.ltc.pojo.vo.governance.AprEmpInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
import com.hungraim.ltc.util.FileUtils;
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.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
......@@ -237,6 +240,27 @@ public class AprOrganController {
return Result.success(page);
}
/**
* 评定人员导出
*
* @param provincial 失能人员所在省
* @param city 失能人员所在市
* @param area 失能人员所在区
* @param organName 评定机构名称
* @param realName 评定人员姓名
* @param tel 评定人员手机号码
* @param groupLeader 是否组长0组长，1非组长
*/
@GetMapping("/aprEmpExport")
public void aprEmpExport(Long organId, Boolean isIncluded,String provincial, String city, String area, String organName, String realName, String tel, String certiCode,String isLock,String empType,String groupLeader,HttpServletResponse response){
Workbook workbook = aprOrganService.aprEmpExport(organId,isIncluded,provincial, city, area, organName, realName,
tel,certiCode,isLock,empType, groupLeader);
// 命名表格
String fileName = "aprEmp.xlsx";
FileUtils.exportResponse(workbook,fileName,response);
}
/**
* 获取评定机构人员信息
*
......
governance/src/main/java/com/hungraim/ltc/governance/controller/SrvProgramController.java
View file @ 4963d527
......@@ -13,6 +13,7 @@ import com.hungraim.ltc.util.Result;
import com.hungraim.ltc.util.ResultCode;
import com.hungraim.ltc.util.TokenParsingUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -52,16 +53,24 @@ public class SrvProgramController {
* @return 返回列表
*/
@RequestMapping("/programList")
public Result getProgramList(@RequestHeader("Authorization") String token, String realName, String realTel, String programStatus, Integer pageNum, Integer pageSize) {
long srvOrganId = TokenParsingUtil.TokenParsing(token, "srvOrganId");
public Result getProgramList(@RequestHeader("Authorization") String token,String srvOrganId, String realName, String realTel, String programStatus, Integer pageNum, Integer pageSize) {
long srvOrganIdL = TokenParsingUtil.TokenParsing(token, "srvOrganId");
if (pageNum == null || pageNum < 1) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
if (pageSize == null || pageSize < 1) {
pageSize = 10;
}
Long srvOrganIdLong = 0L;
if(StringUtils.isNotEmpty(srvOrganId)){
srvOrganIdLong = Long.valueOf(srvOrganId);
}
if(srvOrganIdL != 0){
srvOrganIdLong = srvOrganIdL;
}
Page<SvrSendListVo> page = new Page<>(pageNum, pageSize);
page = srvProgramService.getProgramList(page, srvOrganId, realName, realTel, programStatus);
page = srvProgramService.getProgramList(page, srvOrganIdLong, realName, realTel, programStatus);
return Result.success(page);
}
......
governance/src/main/java/com/hungraim/ltc/governance/dao/AprOrganMapper.java
View file @ 4963d527
......@@ -3,6 +3,7 @@ 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.serviceManage.ChAprOrgan;
import com.hungraim.ltc.pojo.vo.assessment.AprEmpExportVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
import org.apache.ibatis.annotations.Mapper;
......@@ -16,4 +17,7 @@ public interface AprOrganMapper extends BaseMapper<ChAprOrgan> {
Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, List<Long> organIds, String organName, String code);
Page<AprEmpVO> aprEmpList(Page<AprEmpVO> page, List<Long> organIds, String organName, String realName, String tel, String certiCode, String isLock, String empType);
List<AprEmpExportVO> aprEmpExportList(List<Long> organIds, String provincial, String city, String area, String organName, String name, String tel, String certiCode, String isLock, String empType, String groupLeader);
}
governance/src/main/java/com/hungraim/ltc/governance/service/AprOrganService.java
View file @ 4963d527
......@@ -11,6 +11,7 @@ import com.hungraim.ltc.pojo.vo.governance.AprEmpInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.stereotype.Service;
import java.util.List;
......@@ -36,6 +37,9 @@ public interface AprOrganService extends IService<ChAprOrgan> {
Page<AprEmpVO> aprEmpList(Page<AprEmpVO> page, Long organId, Boolean isIncluded, String organName, String realName, String tel, String certiCode, String isLock, String empType);
Workbook aprEmpExport(Long organId, Boolean isIncluded, String provincial, String city, String area, String organName, String name, String tel, String certiCode, String isLock, String empType, String groupLeader);
void addOrUpdateAprEmp(AprEmpInfoVO chAprEmp);
List<ChCfgAprempType> cfgAprEmpType(String parAprempTypeId);
......
governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java
View file @ 4963d527
package com.hungraim.ltc.governance.service.impl;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -14,6 +17,7 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
import com.hungraim.ltc.pojo.vo.assessment.AprEmpExportVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpInfoVO;
import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
......@@ -25,6 +29,7 @@ import com.hungraim.ltc.util.ResultCode;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -155,6 +160,26 @@ public class AprOrganServiceImpl extends ServiceImpl<AprOrganMapper, ChAprOrgan>
return aprOrganMapper.aprEmpList(page, organIds, organName, realName, tel, certiCode, isLock, empType);
}
@Override
public Workbook aprEmpExport(Long organId, Boolean isIncluded,String provincial, String city, String area, String organName, String name, String tel, String certiCode,String isLock,String empType, String groupLeader) {
Result<List<Long>> organChild = null;
List<Long> organIds = null;
if (organId != null) {
if (isIncluded == null) {
isIncluded = false;
}
organChild = organFeignService.getOrganChild(organId, isIncluded);
organIds = organChild.getData();
}
List<AprEmpExportVO> aprEmpExportList = aprOrganMapper.aprEmpExportList(organIds,provincial, city, area, organName, name, tel,certiCode, isLock,empType, groupLeader);
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF); // 对应xlsx
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, AprEmpExportVO.class, aprEmpExportList);
return workbook;
}
@Transactional(rollbackFor = Exception.class)
@Override
public void addOrUpdateAprEmp(AprEmpInfoVO chAprEmp) {
......
governance/src/main/resources/com/hungraim/ltc/governance/mapper/AprOrganMapper.xml
View file @ 4963d527
......@@ -128,4 +128,71 @@
and emp.emp_type = #{empType}
</if>
</select>
<select id="aprEmpExportList" resultType="com.hungraim.ltc.pojo.vo.assessment.AprEmpExportVO">
SELECT emp.emp_id empId,
srvOrgan.srv_organ_name srvOrganName,
organ.organ_code organCode,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) districtCity,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
organ.organ_name organName,
o.organ_name fndOrganName,
organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
(select type.APREMP_NAME from CH_CFG_APREMP_TYPE type where type.APREMP_TYPE_ID = emp.APREMP_TYPE_ID_S) aprempTypeS,
emp.real_name realName,
DECODE(emp.gender, 'M','男','F', '女','N', '不确定') gender,
emp.AGE age,
( case emp.CERTIF_TYPE_ID when '1' then '身份证' else '未知' end ) certifTypeId,
emp.certi_code certiCode,
emp.tel tel,
DECODE(emp.EMP_TYPE, '0','评定人员','1', '管理人员'，'2','医生','3','护士') empType,
DECODE(emp.Group_leader, '0','组长','1', '非组长') groupLeader,
DECODE(emp.IS_LOCK, '0','有效','1', '失效') isLock
FROM ch_apr_emp emp
LEFT JOIN ch_apr_organ organ ON emp.apr_organ_id = organ.apr_organ_id
LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.srv_organ_id
LEFT JOIN ch_fnd_organ o ON o.organ_id = srvOrgan.organ_id
<where>
and organ.STATUS = 0
<if test="organIds != null">
and organ.organ_id in
<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
#{organId}
</foreach>
</if>
<if test="provincial != null and provincial != ''">
and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}
</if>
<if test="city != null and city != ''">
and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) = #{city}
</if>
<if test="area != null and area != ''">
and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) = #{area}
</if>
<if test="organName != null and organName != ''">
and organ.organ_name like CONCAT(CONCAT('%',#{organName}) ,'%')
</if>
<if test="name != null and name != ''">
and emp.real_name like CONCAT(CONCAT('%',#{name}) ,'%')
</if>
<if test="certiCode != null and certiCode != ''">
and emp.certi_code = #{certiCode}
</if>
<if test="tel != null and tel != ''">
and emp.tel = #{tel}
</if>
<if test="groupLeader != null and groupLeader != ''">
and emp.group_leader = #{groupLeader}
</if>
<if test="empType != null and empType != ''">
and emp.emp_type = #{empType}
</if>
<if test="isLock != null and isLock != ''">
and emp.is_lock = #{isLock}
</if>
</where>
</select>
</mapper>
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