ccsens_wiki
/
carbasics
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

20210901v1.4

master
zy_Java 4 years ago
parent
eb41351e65
commit
6aa90118bb
3 changed files with 65 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java
  2. 42
      src/main/java/com/ccsens/carbasics/service/FirstAidService.java
  3. 64
      src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java

6
src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java
View File

@ -145,13 +145,13 @@ public class PatientVo {
private int times;
public int getDataStatus() {
if(dataStatus == Constant.DataStatus.FirstAidPass.status && times >= 1){
if(dataStatus == Constant.DataStatus.FirstAidPass.status && times >= Constant.MAX_UPDATE_NUMBER){
return 100;
}
if(dataStatus == Constant.DataStatus.DischargePass.status && times >= 1){
if(dataStatus == Constant.DataStatus.DischargePass.status && times >= Constant.MAX_UPDATE_NUMBER){
return 100;
}
if(dataStatus == Constant.DataStatus.ApplyForRefuse.status && times >= 1){
if(dataStatus == Constant.DataStatus.ApplyForRefuse.status && times >= Constant.MAX_UPDATE_NUMBER){
return 101;
}
return dataStatus;

42
src/main/java/com/ccsens/carbasics/service/FirstAidService.java
View File

@ -55,8 +55,6 @@ public class FirstAidService implements IFirstAidService{
@Resource
private Snowflake snowflake;
@Resource
private FirstAidMemberMapper firstAidMemberMapper;
@Resource
private FirstAidLogMapper firstAidLogMapper;
@Resource
@ -145,7 +143,7 @@ public class FirstAidService implements IFirstAidService{
if(position == 1){
firstAidMember.setRecordUserId(userId);
}
firstAidMemberMapper.insertSelective(firstAidMember);
firstAidMemberDao.insertSelective(firstAidMember);
//添加急救日志表(创建信息)
FirstAidLog firstAidLog = new FirstAidLog();
firstAidLog.setId(snowflake.nextId());
@ -213,7 +211,7 @@ public class FirstAidService implements IFirstAidService{
//判断操作人的权限
FirstAidMemberExample firstAidMemberExample = new FirstAidMemberExample();
firstAidMemberExample.createCriteria().andFirstAidIdEqualTo(param.getFirstAidId());
List<FirstAidMember> firstAidMembers = firstAidMemberMapper.selectByExample(firstAidMemberExample);
List<FirstAidMember> firstAidMembers = firstAidMemberDao.selectByExample(firstAidMemberExample);
if(CollectionUtil.isEmpty(firstAidMembers)){
throw new BaseException(DefaultCodeError.NO_POWER);
}
@ -319,12 +317,30 @@ public class FirstAidService implements IFirstAidService{
}
//判断当前病例的状态和要修改的是否一致
if(firstAid.getDataStatus() == param.getDataStatus()){
return;
throw new BaseException(DefaultCodeError.DATA_STATUS_SAME);
}
if(firstAid.getDataStatus() == Constant.DataStatus.ApplyFor.status){
firstAid.setDataStatus(param.getDataStatus());
firstAidDao.updateByPrimaryKeySelective(firstAid);
//判断病例状态是否是申请
if(firstAid.getDataStatus() != Constant.DataStatus.ApplyFor.status){
throw new BaseException(DefaultCodeError.NOT_APPLY_FOR);
}
//修改状态
firstAid.setDataStatus(param.getDataStatus());
firstAidDao.updateByPrimaryKeySelective(firstAid);
//添加日志
FirstAidLog firstAidLog = new FirstAidLog();
firstAidLog.setId(snowflake.nextId());
firstAidLog.setFirstAidId(firstAid.getId());
firstAidLog.setOperationTime(System.currentTimeMillis());
firstAidLog.setOperationUserId(userId);
firstAidLog.setOperationUserId(userId);
firstAidLog.setOperationRole((byte) 4);
if(param.getDataStatus() == 0){
firstAidLog.setOperationType((byte) 1);
}
if (param.getDataStatus() == 6){
firstAidLog.setOperationType((byte) 2);
}
firstAidLogDao.insertSelective(firstAidLog);
}
@Override
@ -488,27 +504,27 @@ public class FirstAidService implements IFirstAidService{
switch (param.getDataStatus()) {
case 1:
if (0 != firstAid.getDataStatus() && 2 != firstAid.getDataStatus() && 4 != firstAid.getDataStatus()) {
if (Constant.DataStatus.Create.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidRefuse.status != firstAid.getDataStatus() && Constant.DataStatus.DischargeRefuse.status != firstAid.getDataStatus()) {
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
}
break;
case 2:
if (0 != firstAid.getDataStatus()) {
if (Constant.DataStatus.Create.status != firstAid.getDataStatus()) {
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
}
break;
case 3:
if (0 != firstAid.getDataStatus() && 1 != firstAid.getDataStatus() && 2 != firstAid.getDataStatus() && 4 != firstAid.getDataStatus()) {
if (Constant.DataStatus.Create.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidRefuse.status != firstAid.getDataStatus() && Constant.DataStatus.DischargeRefuse.status != firstAid.getDataStatus()) {
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
}
break;
case 4:
if (0 != firstAid.getDataStatus() && 1 != firstAid.getDataStatus() && 2 != firstAid.getDataStatus()) {
if (Constant.DataStatus.Create.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.FirstAidRefuse.status != firstAid.getDataStatus()) {
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
}
break;
case 5:
if (1 != firstAid.getDataStatus() && 3 != firstAid.getDataStatus() && 6 != firstAid.getDataStatus()) {
if (Constant.DataStatus.FirstAidPass.status != firstAid.getDataStatus() && Constant.DataStatus.DischargePass.status != firstAid.getDataStatus() && Constant.DataStatus.ApplyForRefuse.status != firstAid.getDataStatus()) {
throw new BaseException(DefaultCodeError.DATA_STATUS_ERROR);
}
Integer updateNumber = firstAidLogDao.countUpdateNumber(param.getFirstAidId());

64
src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java
View File

@ -8,37 +8,39 @@ import com.ccsens.util.CodeError;
public class DefaultCodeError extends CodeError {
public static final Code NOT_WBS_SHEET = new Code(1,"找不到wbs表",true);
public static final Code NOT_MEMBER_SHEET = new Code(1,"找不到项目成员表",true);
public static final Code WSB_NOT_PROJECT_HEADER = new Code(2,"读取项目信息异常",true);
public static final Code WSB_NOT_TASK_HEADER = new Code(3,"读取任务分解异常",true);
public static final Code WBS_PROJECT_TIME_ERROR = new Code(4,"时间格式异常", true);
public static final Code WBS_PHONE_ERROR = new Code(5,"手机号格式错误", true);
public static final Code WBS_NOT_FIRST_ROLE = new Code(6,"系统角色名称错误", true);
public static final Code WBS_NOT_FIND_ROLE = new Code(7,"未找到对应的角色", true);
public static final Code FILE_FORMAT_ERROR = new Code(8,"不支持的格式类型", true);
public static final Code WBS_NOT_PROJECT_TIME = new Code(9,"项目时间不能为空", true);
public static final Code TASK_VITAL_LABEL_ERROR = new Code(9,"任务标签异常", true);
public static final Code WBS_NOT_PROJECT_NAME = new Code(10,"项目名称不能为空", true);
public static final Code PLUGIN_NAME_ERROR = new Code(10,"请填写正确的插件名称", true);
public static final Code NOT_QUESTION_CODE = new Code(11,"请输入题目code", true);
public static final Code NOT_HOSPITAL_SERIAL = new Code(12,"请填入正确的医院编号", true);
public static final Code NOT_FIRST_AID_ID = new Code(13,"请填入正确的急救信息", true);
public static final Code PARAM_ERROR = new Code(14,"请检查输入内容后重新尝试。", true);
public static final Code PROJECT_ERROR = new Code(15,"项目信息异常", true);
public static final Code ARRIVE_WORKER_ERROR = new Code(16,"到场人员信息错误", true);
public static final Code NO_POWER = new Code(17,"权限不足", true);
public static final Code NO_HOSPITAL = new Code(18,"未查到对应的医院信息", true);
public static final Code NO_DATA_MODIFY_PRIVILEGE = new Code(19,"没有操作权限", true);
public static final Code IDCARD_ERROR = new Code(20,"请输入正确的身份证号", true);
public static final Code NOT_TEMPLATE = new Code(21,"科室没有病例类型配置，请联系运维人员", true);
public static final Code NOT_HOSPITAL_ID = new Code(22,"医院信息尚未配置，请联系运维人员", true);
public static final Code NOT_ORGANIZATION = new Code(23,"机构信息尚未配置，请联系运维人员", true);
public static final Code PROJECT_NAME_REPEAT = new Code(24,"项目名称重复", true);
public static final Code FEIGN_ERROR = new Code(25,"导入项目失败", true);
public static final Code DOCTOR_HAS_JOINED = new Code(20,"已有医生加入", true);
public static final Code REPEAT_QUIT = new Code(21,"您已经不是录入者,无需重复退出", true);
public static final Code DATA_STATUS_ERROR = new Code(22,"请先完成之前的审核", true);
public static final Code SURPASS_MAX_NUMBER = new Code(22,"超过最大申请修改次数", true);
public static final Code NOT_MEMBER_SHEET = new Code(2,"找不到项目成员表",true);
public static final Code WSB_NOT_PROJECT_HEADER = new Code(3,"读取项目信息异常",true);
public static final Code WSB_NOT_TASK_HEADER = new Code(4,"读取任务分解异常",true);
public static final Code WBS_PROJECT_TIME_ERROR = new Code(5,"时间格式异常", true);
public static final Code WBS_PHONE_ERROR = new Code(6,"手机号格式错误", true);
public static final Code WBS_NOT_FIRST_ROLE = new Code(7,"系统角色名称错误", true);
public static final Code WBS_NOT_FIND_ROLE = new Code(8,"未找到对应的角色", true);
public static final Code FILE_FORMAT_ERROR = new Code(9,"不支持的格式类型", true);
public static final Code WBS_NOT_PROJECT_TIME = new Code(10,"项目时间不能为空", true);
public static final Code TASK_VITAL_LABEL_ERROR = new Code(11,"任务标签异常", true);
public static final Code WBS_NOT_PROJECT_NAME = new Code(12,"项目名称不能为空", true);
public static final Code PLUGIN_NAME_ERROR = new Code(13,"请填写正确的插件名称", true);
public static final Code NOT_QUESTION_CODE = new Code(14,"请输入题目code", true);
public static final Code NOT_HOSPITAL_SERIAL = new Code(15,"请填入正确的医院编号", true);
public static final Code NOT_FIRST_AID_ID = new Code(16,"请填入正确的急救信息", true);
public static final Code PARAM_ERROR = new Code(17,"请检查输入内容后重新尝试。", true);
public static final Code PROJECT_ERROR = new Code(18,"项目信息异常", true);
public static final Code ARRIVE_WORKER_ERROR = new Code(19,"到场人员信息错误", true);
public static final Code NO_POWER = new Code(20,"权限不足", true);
public static final Code NO_HOSPITAL = new Code(21,"未查到对应的医院信息", true);
public static final Code NO_DATA_MODIFY_PRIVILEGE = new Code(22,"没有操作权限", true);
public static final Code IDCARD_ERROR = new Code(23,"请输入正确的身份证号", true);
public static final Code NOT_TEMPLATE = new Code(24,"科室没有病例类型配置，请联系运维人员", true);
public static final Code NOT_HOSPITAL_ID = new Code(25,"医院信息尚未配置，请联系运维人员", true);
public static final Code NOT_ORGANIZATION = new Code(26,"机构信息尚未配置，请联系运维人员", true);
public static final Code PROJECT_NAME_REPEAT = new Code(27,"项目名称重复", true);
public static final Code FEIGN_ERROR = new Code(28,"导入项目失败", true);
public static final Code DOCTOR_HAS_JOINED = new Code(29,"已有医生加入", true);
public static final Code REPEAT_QUIT = new Code(30,"您已经不是录入者,无需重复退出", true);
public static final Code DATA_STATUS_ERROR = new Code(31,"请先完成之前的审核", true);
public static final Code SURPASS_MAX_NUMBER = new Code(32,"超过最大申请修改次数", true);
public static final Code DATA_STATUS_SAME = new Code(33,"状态一致无需修改", true);
public static final Code NOT_APPLY_FOR = new Code(34,"未申请修改，无法修改状态", true);

Write Preview
Loading…
Cancel
Save