Compare commits
5 Commits
e5a6df89a1
...
472572ee01
| Author | SHA1 | Date | |
|---|---|---|---|
| 472572ee01 | |||
| 70b50edb2b | |||
| 204573f557 | |||
| c89c786fde | |||
| c9c746b2ba |
@ -31,6 +31,7 @@ public class ExpertEntity implements UserDetails, RequestUser {
|
|||||||
private Integer provId;
|
private Integer provId;
|
||||||
private Integer countyId;
|
private Integer countyId;
|
||||||
private Integer cityId;
|
private Integer cityId;
|
||||||
|
private String mobileModel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* security 权限串
|
* security 权限串
|
||||||
|
|||||||
@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
|
|||||||
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
|
||||||
import net.lab1024.sa.admin.module.app.medicalrecord.domain.*;
|
import net.lab1024.sa.admin.module.app.medicalrecord.domain.*;
|
||||||
import net.lab1024.sa.admin.module.app.medicalrecord.service.MedicalRecordService;
|
import net.lab1024.sa.admin.module.app.medicalrecord.service.MedicalRecordService;
|
||||||
|
import net.lab1024.sa.common.common.annoation.NoNeedLogin;
|
||||||
import net.lab1024.sa.common.common.domain.PageResult;
|
import net.lab1024.sa.common.common.domain.PageResult;
|
||||||
import net.lab1024.sa.common.common.domain.ResponseDTO;
|
import net.lab1024.sa.common.common.domain.ResponseDTO;
|
||||||
import net.lab1024.sa.common.common.util.SmartRequestUtil;
|
import net.lab1024.sa.common.common.util.SmartRequestUtil;
|
||||||
@ -62,4 +63,11 @@ public class MedicalRecordController {
|
|||||||
|
|
||||||
return medicalRecordService.getMedicalRecordCount(form,expertId);
|
return medicalRecordService.getMedicalRecordCount(form,expertId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "上传手机型号")
|
||||||
|
// @NoNeedLogin
|
||||||
|
@PostMapping("/upload/mobileModel")
|
||||||
|
public ResponseDTO<String> uploadMobileModel(@RequestBody @Validated() UploadMobileModelForm addForm) {
|
||||||
|
return medicalRecordService.uploadMobileModel(addForm);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,23 @@
|
|||||||
|
package net.lab1024.sa.admin.module.app.medicalrecord.domain;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import net.lab1024.sa.common.common.enumeration.DischargeStatusEnum;
|
||||||
|
import net.lab1024.sa.common.common.enumeration.GenderEnum;
|
||||||
|
import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
|
||||||
|
import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
|
||||||
|
import org.hibernate.validator.constraints.Length;
|
||||||
|
import org.hibernate.validator.constraints.Range;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
import javax.validation.constraints.NotBlank;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class UploadMobileModelForm {
|
||||||
|
@ApiModelProperty(value = "手机型号")
|
||||||
|
private String mod;
|
||||||
|
|
||||||
|
}
|
||||||
@ -5,7 +5,9 @@ import cn.hutool.core.date.DateUtil;
|
|||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import net.lab1024.sa.admin.module.app.expert.admin.ExpertEntity;
|
||||||
import net.lab1024.sa.admin.module.app.expert.admin.ExpertSignVO;
|
import net.lab1024.sa.admin.module.app.expert.admin.ExpertSignVO;
|
||||||
|
import net.lab1024.sa.admin.module.app.expert.dao.ExpertDao;
|
||||||
import net.lab1024.sa.admin.module.app.expert.dao.FxqSignDao;
|
import net.lab1024.sa.admin.module.app.expert.dao.FxqSignDao;
|
||||||
import net.lab1024.sa.admin.module.app.expert.domain.entity.FxqSignEntity;
|
import net.lab1024.sa.admin.module.app.expert.domain.entity.FxqSignEntity;
|
||||||
import net.lab1024.sa.admin.module.app.expert.service.ExpertFxqService;
|
import net.lab1024.sa.admin.module.app.expert.service.ExpertFxqService;
|
||||||
@ -72,6 +74,9 @@ public class MedicalRecordService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ExpertSignService expertSignService;
|
private ExpertSignService expertSignService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ExpertDao expertDao;
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private FxqSignDao fxqSignDao;
|
private FxqSignDao fxqSignDao;
|
||||||
|
|
||||||
@ -787,4 +792,37 @@ public class MedicalRecordService {
|
|||||||
|
|
||||||
return ResponseDTO.app_ok(caseCount);
|
return ResponseDTO.app_ok(caseCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 上传手机型号
|
||||||
|
@Transactional
|
||||||
|
public ResponseDTO<String> uploadMobileModel(UploadMobileModelForm addForm){
|
||||||
|
try {
|
||||||
|
Long expertId = SmartRequestUtil.getRequestUserId();
|
||||||
|
ExpertEntity expert = expertDao.getExpert(expertId);
|
||||||
|
if (expert == null) {
|
||||||
|
return ResponseDTO.app_ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Objects.equals(addForm.getMod(), "")){
|
||||||
|
return ResponseDTO.app_ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 修改手机型号
|
||||||
|
String mod = expert.getMobileModel();
|
||||||
|
if (!Objects.equals(mod, "") && mod != null){
|
||||||
|
if (mod.toLowerCase().contains(addForm.getMod().toLowerCase())) {
|
||||||
|
return ResponseDTO.app_ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod = mod + " | " + addForm.getMod();
|
||||||
|
expert.setMobileModel(mod);
|
||||||
|
expertDao.updateById(expert);
|
||||||
|
|
||||||
|
return ResponseDTO.app_ok();
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ResponseDTO.app_ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -86,4 +86,7 @@ public class CaseplatformCaseVO {
|
|||||||
|
|
||||||
@ApiModelProperty(value = "协议地址")
|
@ApiModelProperty(value = "协议地址")
|
||||||
private String signLinkPc = "";
|
private String signLinkPc = "";
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "手机型号")
|
||||||
|
private String mobileModel;
|
||||||
}
|
}
|
||||||
@ -7,6 +7,7 @@
|
|||||||
SELECT
|
SELECT
|
||||||
t_caseplatform_case.*,t_caseplatform_user.uid,t_caseplatform_user.name userName,
|
t_caseplatform_case.*,t_caseplatform_user.uid,t_caseplatform_user.name userName,
|
||||||
t_caseplatform_expert.name expertName,
|
t_caseplatform_expert.name expertName,
|
||||||
|
t_caseplatform_expert.mobile_model mobileModel,
|
||||||
(select name from t_area where id=t_caseplatform_expert.prov_id) expertProvName,
|
(select name from t_area where id=t_caseplatform_expert.prov_id) expertProvName,
|
||||||
(select name from t_area where id=t_caseplatform_expert.city_id) expertCityName,
|
(select name from t_area where id=t_caseplatform_expert.city_id) expertCityName,
|
||||||
t_caseplatform_expert.hospital_name expertHospitalName,
|
t_caseplatform_expert.hospital_name expertHospitalName,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user