gdxz/case-collection
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gdxz:24459c946cb5710b3aba3e2a65f5b952b2a6082c
Branches Tags
gdxz:master
gdxz:dev
...
compare: gdxz:1606d827b48bbf3646dabd6fa426a484a71b4b82
Branches Tags
gdxz:master
gdxz:dev

10 Commits
24459c946c ... 1606d827b4

Author SHA1 Message Date
wucongxing8150
1606d827b4 修改了审核不通过 2025-08-14 17:00:51 +08:00
wucongxing8150
5a2dd03e3e 修改了审核时间结算时间 2025-08-14 15:09:14 +08:00
wucongxing8150
85ab3666ff 修改时间 2025-08-14 14:24:41 +08:00
wucongxing8150
12f12354fa 修改时区1 2025-08-14 14:21:08 +08:00
wucongxing8150
49a15efe80 修改时区 2025-08-14 14:16:02 +08:00
wucongxing8150
29b3604f61 修改一系列事件 2025-08-14 14:14:28 +08:00
wucongxing8150
6730a9a5d2 新增了专家管理搜索条件1 2025-08-14 14:01:43 +08:00
wucongxing8150
34bc0a9977 新增了专家管理搜索条件 2025-08-14 13:27:42 +08:00
wucongxing8150
d09959c5d0 测试专家管理导出 2025-08-14 13:14:08 +08:00
wucongxing8150
72ffe67384 后台--病例管理列表显示：新增病例ID、审核通过时间、结算时间(劳务支付时间) 2025-08-14 11:45:57 +08:00
13 changed files with 60 additions and 13 deletions
Show Stats Expand all files Collapse all files

2
Dockerfile-dev
View File

@ -47,4 +47,4 @@ COPY --from=builder /app/sa-admin/target/*.jar app.jar
EXPOSE 5477
# 启动应用
ENTRYPOINT ["java", "-jar", "app.jar"]
ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "app.jar"]

2
Dockerfile-prod
View File

@ -47,4 +47,4 @@ COPY --from=builder /app/sa-admin/target/*.jar app.jar
EXPOSE 5477
# 启动应用
ENTRYPOINT ["java", "-jar", "app.jar"]
ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "app.jar"]

8
sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java
View File

@ -10,6 +10,9 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableScheduling;
import javax.annotation.PostConstruct;
import java.util.TimeZone;
/**
* SmartAdmin 项目启动类
*
@ -30,4 +33,9 @@ public class SmartAdminApplication {
public static void main(String[] args) {
SpringApplication.run(SmartAdminApplication.class, args);
}
@PostConstruct
public void init(){
TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
}
}

6
sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java
View File

@ -317,6 +317,7 @@ public class MedicalRecordService {
medicalRecord.setSeductionReason(updateForm.getSeductionReason());
medicalRecord.setStatus(0);
medicalRecord.setReason("");
medicalRecord.setUpdateTime(LocalDateTime.now());
medicalRecorDao.updateById(medicalRecord);
// 病历-用户
@ -332,6 +333,7 @@ public class MedicalRecordService {
medicalRecordUser.setUid(updateForm.getUid());
medicalRecordUser.setSex(Integer.valueOf(updateForm.getSex()));
medicalRecordUser.setAge(updateForm.getAge());
medicalRecord.setUpdateTime(LocalDateTime.now());
medicalRecorUserDao.updateById(medicalRecordUser);
// 病例-病历摘要
@ -345,6 +347,7 @@ public class MedicalRecordService {
if (!Objects.equals(updateForm.getAbstractStr(), medicalRecorAbstrac.getAbstractStr())){
medicalRecorAbstrac.setAbstractStr(updateForm.getAbstractStr());
medicalRecord.setUpdateTime(LocalDateTime.now());
medicalRecorAbstracDao.updateById(medicalRecorAbstrac);
}
@ -356,6 +359,7 @@ public class MedicalRecordService {
dp.setCaseId(medicalRecord.getId());
dp.setTreatTime(item.getTreatTime());
dp.setContent(item.getContent());
medicalRecord.setUpdateTime(LocalDateTime.now());
int res = medicalRecorDpmasDao.insert(dp);
if (res <= 0){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@ -412,6 +416,7 @@ public class MedicalRecordService {
medicalRecordCheckData.setBioImg(updateForm.getBioImg());
medicalRecordCheckData.setInfImg(updateForm.getInfImg());
medicalRecordCheckData.setCoaImg(updateForm.getCoaImg());
medicalRecord.setUpdateTime(LocalDateTime.now());
medicalRecorCheckDataDao.updateById(medicalRecordCheckData);
// 疾病转归
@ -427,6 +432,7 @@ public class MedicalRecordService {
medicalRecordPrognosis.setDay(Integer.valueOf(updateForm.getDay()));
medicalRecordPrognosis.setDischargeStatus(Integer.valueOf(updateForm.getDischargeStatus()));
medicalRecordPrognosis.setDischargeSituation(updateForm.getDischargeSituation());
medicalRecord.setUpdateTime(LocalDateTime.now());
medicalRecorPrognosisDao.updateById(medicalRecordPrognosis);
return ResponseDTO.app_ok();

3
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java
View File

@ -78,8 +78,7 @@ public class CaseplatformCaseController {
@PostMapping("/caseplatformCase/cancelExamine")
@PreAuthorize("@saAuth.checkPermission('case-system:case:examine')")
public ResponseDTO<String> cancelExamine(@RequestBody @Valid CancelExamineForm form) {
caseplatformCaseService.cancelExamine(form);
return ResponseDTO.ok();
return caseplatformCaseService.cancelExamine(form);
}
// @ApiOperation("导出excle @author HMM")

6
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseEntity.java
View File

@ -64,6 +64,12 @@ public class CaseplatformCaseEntity {
*/
private Integer status;
/**
* 审核不通过原因
*/
private String reason;
// 审核通过时间
private LocalDateTime examineTime;

12
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/EasyExcelCaseDetailVO.java
View File

@ -28,11 +28,12 @@ import java.time.LocalDateTime;
@EqualsAndHashCode
public class EasyExcelCaseDetailVO {
@ExcelIgnore
@ApiModelProperty(value = "病例ID")
@ExcelProperty("病例ID")
private Long id;
@ApiModelProperty(value = "专家姓名")
@ExcelProperty("姓名")
@ExcelProperty("专家姓名")
private String expertName;
@ApiModelProperty(value = "专家所在省份名称")
@ -71,8 +72,15 @@ public class EasyExcelCaseDetailVO {
@ExcelProperty(value = "病例状态", converter = CaseStatusConverter.class)
private Integer status;
@ApiModelProperty(value = "审核通过时间")
@ExcelProperty("审核时间")
private LocalDateTime examineTime;
@ApiModelProperty(value = "结算标识")
@ExcelProperty(value = "结算状态", converter = CaseCaseSettlConverter.class)
private Integer settlementFlag;
@ApiModelProperty(value = "结算时间")
@ExcelProperty("结算时间")
private LocalDateTime settlementTime;
}

24
sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java
View File

@ -396,6 +396,7 @@ public class CaseplatformCaseService {
// 修改病例结算状态
caseplatformCase.setSettlementFlag(1);
caseplatformCase.setSettlementTime(LocalDateTime.now());
caseplatformCase.setUpdateTime(LocalDateTime.now());
caseplatformCaseDao.updateById(caseplatformCase);
}
@ -412,6 +413,7 @@ public class CaseplatformCaseService {
*/
public ResponseDTO<String> add(CaseplatformCaseAddForm addForm) {
CaseplatformCaseEntity caseplatformCaseEntity = SmartBeanUtil.copy(addForm, CaseplatformCaseEntity.class);
caseplatformCaseEntity.setUpdateTime(LocalDateTime.now());
caseplatformCaseDao.insert(caseplatformCaseEntity);
return ResponseDTO.ok();
}
@ -424,6 +426,7 @@ public class CaseplatformCaseService {
*/
public ResponseDTO<String> update(CaseplatformCaseUpdateForm updateForm) {
CaseplatformCaseEntity caseplatformCaseEntity = SmartBeanUtil.copy(updateForm, CaseplatformCaseEntity.class);
caseplatformCaseEntity.setUpdateTime(LocalDateTime.now());
caseplatformCaseDao.updateById(caseplatformCaseEntity);
return ResponseDTO.ok();
}
@ -454,6 +457,7 @@ public class CaseplatformCaseService {
caseplatformCase.setStatus(status);
caseplatformCase.setExamineTime(LocalDateTime.now());
caseplatformCase.setUpdateTime(LocalDateTime.now());
caseplatformCaseDao.updateById(caseplatformCase);
return ResponseDTO.ok();
@ -482,7 +486,10 @@ public class CaseplatformCaseService {
return ResponseDTO.userErrorParam("该用户未签署协议");
}
caseplatformCaseDao.settlement(case_id);
caseplatformCase.setSettlementFlag(1);
caseplatformCase.setSettlementTime(LocalDateTime.now());
caseplatformCase.setUpdateTime(LocalDateTime.now());
caseplatformCaseDao.updateById(caseplatformCase);
return ResponseDTO.ok();
}
@ -491,8 +498,19 @@ public class CaseplatformCaseService {
* 审核拒绝
* @param form
*/
public void cancelExamine(CancelExamineForm form){
caseplatformCaseDao.cancelExamine(form);
public ResponseDTO<String> cancelExamine(CancelExamineForm form){
// 获取病例数据
CaseplatformCaseEntity caseplatformCase = caseplatformCaseDao.selectById(form.getCaseId());
if (caseplatformCase == null) {
return ResponseDTO.userErrorParam("病例不存在");
}
caseplatformCase.setStatus(2);
caseplatformCase.setReason(form.getReason());
caseplatformCase.setExamineTime(LocalDateTime.now());
caseplatformCase.setUpdateTime(LocalDateTime.now());
caseplatformCaseDao.updateById(caseplatformCase);
return ResponseDTO.ok();
}
public ResponseDTO<CaseplatformCaseDetailVO> getDetail(Long case_id){

2
sa-admin/src/main/resources/dev/application.yaml
View File

@ -69,4 +69,4 @@ jackson:
fail-on-unknown-properties: false
default-property-inclusion: always
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
time-zone: Asia/Shanghai

2
sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml
View File

@ -22,6 +22,8 @@
AND ( INSTR(t_caseplatform_user.uid,#{queryForm.name})
OR INSTR(t_caseplatform_user.name,#{queryForm.name})
OR INSTR(t_caseplatform_expert.name,#{queryForm.name})
OR INSTR(t_caseplatform_expert.hospital_name,#{queryForm.name})
OR INSTR(t_caseplatform_expert.mobile,#{queryForm.name})
)
</if>
<!--0待审核 1审核通过 2审核不通过-->

2
sa-admin/src/main/resources/prod/application.yaml
View File

@ -61,4 +61,4 @@ jackson:
fail-on-unknown-properties: false
default-property-inclusion: always
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
time-zone: Asia/Shanghai

2
sa-common/src/main/resources/dev/sa-common.yaml
View File

@ -55,7 +55,7 @@ spring:
fail-on-unknown-properties: false
default-property-inclusion: always
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
time-zone: Asia/Shanghai
# 缓存实现类型
cache:

2
sa-common/src/main/resources/prod/sa-common.yaml
View File

@ -55,7 +55,7 @@ spring:
fail-on-unknown-properties: false
default-property-inclusion: always
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
time-zone: Asia/Shanghai
# 缓存实现类型
cache: