Skip to content

L
long-tern-care-service
Commit ec84f5c5 authored by zhangch's avatar zhangch
Browse files
Options

Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

parents 77da5d11 85f8712c
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 25 deletions
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java
View file @ ec84f5c5
......@@ -110,7 +110,7 @@ public class TaskServiceImpl implements TaskService {
chAprReport.setEvaluateTime(evaluateDate);
aprReportMapper.updateById(chAprReport);
//修改鉴定报告人员(有就update,没有就insert)
List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", reportId));
List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", reportId).orderByDesc("info_id"));
if (person1 != null) {
if (personInfos.size() >= 1) {
ChAprPersonInfo personInfo = personInfos.get(0);
......@@ -126,7 +126,7 @@ public class TaskServiceImpl implements TaskService {
}
if (person2 != null) {
if (personInfos.size() >= 2) {
ChAprPersonInfo personInfo = personInfos.get(0);
ChAprPersonInfo personInfo = personInfos.get(1);
personInfo.setEmpId(person2);
personInfoMapper.updateById(personInfo);
} else {
......@@ -139,7 +139,7 @@ public class TaskServiceImpl implements TaskService {
}
if (person3 != null) {
if (personInfos.size() >= 3) {
ChAprPersonInfo personInfo = personInfos.get(0);
ChAprPersonInfo personInfo = personInfos.get(2);
personInfo.setEmpId(person3);
personInfoMapper.updateById(personInfo);
} else {
......
assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml
View file @ ec84f5c5
......@@ -14,8 +14,8 @@
disable.real_name realName,
task.fcd fcd,
disable.certi_code certiCode,
task.pol_no polNo,
task.remark remark,
report.pol_no polNo,
report.remark remark,
disable.BIRTHDAY birthday,
(select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
(select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
......@@ -53,6 +53,7 @@
left join ch_apr_emp emp on task.apr_emp_id = emp.emp_id and emp.IS_LOCK = 0
left join ch_apr_task_push push on task.task_id = push.task_id
left join ch_apr_task_emp cate on task.task_id = cate.task_id
left join ch_apr_report report on report.TASK_ID = task.TASK_ID
<where>
<if test="organIds != null">
and task.apr_organ_id in
......@@ -110,8 +111,8 @@
report.disable_level_id disableLevelId,
info.REAL_NAME realName,
info.CERTI_CODE certiCode,
task.pol_no polNo,
task.remark remark,
report.pol_no polNo,
report.remark remark,
info.birthday birthday,
(SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
(SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
......@@ -233,22 +234,32 @@
push.Planned_departure_time plannedDepartureTime,
push.Distance_station_kilometers distanceStationKilometers,
push.Distance_station_travel_time distanceStationTravelTime,
push.Total_distance totalDistance
push.Total_distance totalDistance,
push.Length_of_time lengthOfTime,
emp.real_name empRealName,
emp.certi_code empCertiCode,
push.status status,
push.Refuse_reason refuseReason,/*拒绝原因*/
push.Refuse_remark remark/*备注*/
from ch_apr_task_push push
left join ch_apr_task task on push.task_id = task.task_id
left join CH_FND_ORGAN organ on organ.organ_id = task.organ_id
left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
left join ch_apr_emp emp on emp.emp_id = push.emp_id
where push.group_number = #{groupNumber}
</select>
<select id="personInfoList" resultType="com.hungraim.ltc.pojo.vo.assessment.PersonInfoVO">
SELECT emp.emp_id empId,
organ.organ_name orgaName,
emp.real_name realName
emp.real_name realName,
emp.tel tel,
emp.certi_code certiCode
FROM ch_apr_person_info info
LEFT JOIN ch_apr_emp emp ON info.emp_id = emp.emp_id
LEFT JOIN ch_apr_organ organ ON organ.apr_organ_id = emp.apr_organ_id
where info.report_id = #{reportId}
order by info.info_id desc
</select>
</mapper>
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/PersonInfoVO.java
View file @ ec84f5c5
......@@ -13,4 +13,8 @@ public class PersonInfoVO {
private String realName;
//评定人员所属机构
private String orgaName;
//评定人员手机号
private String tel;
//评定人员身份证号
private String certiCode;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskDistributionVO.java
View file @ ec84f5c5
......@@ -22,7 +22,7 @@ public class TaskDistributionVO {
//失能人员姓名
private String realName;
//申请日期
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date fcd;
//失能人员身份证号码
private String certiCode;
......@@ -31,7 +31,7 @@ public class TaskDistributionVO {
//备注
private String remark;
//年龄
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;//出生年月
//诊断疾病
private String diseTypeF;//大类
......@@ -72,13 +72,13 @@ public class TaskDistributionVO {
//评定人员所属机构名称
private String empOrganName;
//任务分配时间
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date assignTime;
//任务接受时间
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date acceptTime;
//任务完成时间
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date finishTime;
//任务状态
private Integer taskStatus;
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskGroupInfoVO.java
View file @ ec84f5c5
package com.hungraim.ltc.pojo.vo.assessment;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* 评定任务分组管理列表详情
*/
......@@ -14,7 +17,8 @@ public class TaskGroupInfoVO {
/**
* 分组日期
*/
private String time;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date time;
/**
* 组号
*/
......@@ -42,9 +46,10 @@ public class TaskGroupInfoVO {
*/
private String gender;
/**
* 失能人员年龄
* 失能人员(出生日期)年龄
*/
private String birthday;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
/**
* 失能人员身份证号码
*/
......@@ -52,11 +57,13 @@ public class TaskGroupInfoVO {
/**
* 计划到达时间
*/
private String plannedArrivalTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date plannedArrivalTime;
/**
* 计划离开时间
*/
private String plannedDepartureTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date plannedDepartureTime;
/**
* 距离前站(公里数)
*/
......@@ -64,9 +71,34 @@ public class TaskGroupInfoVO {
/**
* 距离前站行驶时间
*/
private String distanceStationTravelTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date distanceStationTravelTime;
/**
* 车次总距离
*/
private String totalDistance;
/**
* 总时长
*/
private String lengthOfTime;
/**
* 评定组长姓名
*/
private String empRealName;
/**
* 评定组长身份证号码
*/
private String empCertiCode;
/**
* 状态
*/
private String status;
/**
* 拒绝原因
*/
private String refuseReason;
/**
* 备注
*/
private String remark;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskGroupVO.java
View file @ ec84f5c5
......@@ -13,7 +13,7 @@ public class TaskGroupVO {
//任务推送id
private Integer taskPushId;
//任务分配日期
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date assignTime;
//机构代码
private Integer aprOrganId;
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskReportVO.java
View file @ ec84f5c5
......@@ -31,10 +31,10 @@ public class TaskReportVO {
//备注
private String remark;
//评估时间
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date evaluateTime;
//出生年月
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
//诊断疾病
private String diseTypeF;
......@@ -64,6 +64,6 @@ public class TaskReportVO {
//评定结果
private String riskLevel;
//录入时间
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date effTime;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableVO.java
View file @ ec84f5c5
......@@ -32,7 +32,7 @@ public class DisableVO implements Serializable {
//联系人姓名
private String opername;
//年龄
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
//性别
private String gender;
......
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