diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/AddTemplateTaskRequest.java b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/AddTemplateTaskRequest.java index 2d312f3..11d8b37 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/AddTemplateTaskRequest.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/task/AddTemplateTaskRequest.java @@ -28,6 +28,13 @@ public class AddTemplateTaskRequest { */ private List signers; + /** + * 通知，默认为0 + * 0：接口返回，不直接通知用户 + * 1：短信通知。如果选择1，则放心签会将签署链接通过短信的方式发送至签署方的手机当中 + */ + private String notifyType = "0"; + /** * 签署任务标题(长度最大值默认为50字符) */ diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java index 507159d..7f22728 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java @@ -4,10 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordDetailVO; import net.lab1024.sa.admin.module.app.medicalrecord.service.MedicalRecordService; -import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.CancelExamineForm; -import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.CaseMainDiagnoseForm; -import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.CaseplatformCaseQueryForm; -import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.CaseplatformCaseUpdateForm; +import net.lab1024.sa.admin.module.business.caseplatformcase.domain.form.*; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.CaseplatformCaseDetailVO; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.CaseplatformCaseVO; import net.lab1024.sa.admin.module.business.caseplatformcase.service.CaseplatformCaseService; @@ -108,7 +105,20 @@ public class CaseplatformCaseController { @PutMapping("/caseplatformCase/mainDiagnose") @PreAuthorize("@saAuth.checkPermission('case-system:case:mainDiagnose')") public ResponseDTO caseMainDiagnose(@RequestBody @Valid CaseMainDiagnoseForm form) { + return caseplatformCaseService.caseMainDiagnose(form); + } - return ResponseDTO.ok(); + @ApiOperation("人工肝治疗图片修改") + @PutMapping("/caseplatformCase/dpmasImg") + @PreAuthorize("@saAuth.checkPermission('case-system:case:checkPermission')") + public ResponseDTO caseDpmasImg(@RequestBody @Valid CaseDpmasImgForm form) { + return caseplatformCaseService.caseDpmasImg(form); + } + + @ApiOperation("实验室检测图片修改") + @PutMapping("/caseplatformCase/checkdataImg") + @PreAuthorize("@saAuth.checkPermission('case-system:case:mainDiagnose')") + public ResponseDTO caseCheckdataImg(@RequestBody @Valid CaseCheckdataImgForm form) { + return caseplatformCaseService.caseCheckdataImg(form); } } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseEntity.java index 08251ee..2deb3d4 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseEntity.java @@ -64,4 +64,19 @@ public class CaseplatformCaseEntity { */ private LocalDateTime updateTime; + /** + * 主要诊断 + */ + private String mainDiagnose; + + /** + * 患者病因 + */ + private String diseaseCause; + + /** + * 诱因 + */ + private String seductionReason; + } \ No newline at end of file diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseCheckdataImgForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseCheckdataImgForm.java new file mode 100644 index 0000000..df54a6f --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseCheckdataImgForm.java @@ -0,0 +1,17 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.domain.form; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class CaseCheckdataImgForm { + @ApiModelProperty(value = "病例", required = true) + @NotNull(message = "病例 不能为空") + private String caseId; + + @ApiModelProperty(value = "检测图片", required = true) + @NotNull(message = "检测图片 不能为空") + private String checkImg; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseDpmasImgForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseDpmasImgForm.java new file mode 100644 index 0000000..f1250a8 --- /dev/null +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseDpmasImgForm.java @@ -0,0 +1,21 @@ +package net.lab1024.sa.admin.module.business.caseplatformcase.domain.form; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class CaseDpmasImgForm { + @ApiModelProperty(value = "病例", required = true) + @NotNull(message = "病例 不能为空") + private String dmpsId; + + @ApiModelProperty(value = "病例", required = true) + @NotNull(message = "病例 不能为空") + private String caseId; + + @ApiModelProperty(value = "记录图片", required = true) + @NotNull(message = "记录图片 不能为空") + private String dpmasImg; +} diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseMainDiagnoseForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseMainDiagnoseForm.java index 565a9fe..db3261f 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseMainDiagnoseForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/form/CaseMainDiagnoseForm.java @@ -7,7 +7,11 @@ import javax.validation.constraints.NotNull; @Data public class CaseMainDiagnoseForm { - @ApiModelProperty(value = "出院诊断照片", required = true) - @NotNull(message = "出院诊断照片 不能为空") - private String mainDiagnoseImg; + @ApiModelProperty(value = "病例", required = true) + @NotNull(message = "病例 不能为空") + private String caseId; + + @ApiModelProperty(value = "出院诊断", required = true) + @NotNull(message = "出院诊断 不能为空") + private String mainDiagnose; } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java index 7fc82d2..908ac44 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java @@ -12,6 +12,13 @@ import net.lab1024.sa.admin.module.app.expert.admin.ExpertWhiteEntity; import net.lab1024.sa.admin.module.app.expert.dao.CasePlatformBankDao; import net.lab1024.sa.admin.module.app.expert.dao.ExpertWhiteEntityDao; import net.lab1024.sa.admin.module.app.expert.domain.entity.CasePlatformBankEntity; +import net.lab1024.sa.admin.module.app.expert.domain.entity.FxqSignEntity; +import net.lab1024.sa.admin.module.app.medicalrecord.dao.MedicalRecorCheckDataDao; +import net.lab1024.sa.admin.module.app.medicalrecord.dao.MedicalRecorDao; +import net.lab1024.sa.admin.module.app.medicalrecord.dao.MedicalRecorDpmasDao; +import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordCheckdataEntity; +import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordDpmsEntity; +import net.lab1024.sa.admin.module.app.medicalrecord.domain.MedicalRecordEntity; import net.lab1024.sa.admin.module.business.area.domain.vo.ProvVO; import net.lab1024.sa.admin.module.business.caseplatformcase.dao.CaseplatformCaseDao; import net.lab1024.sa.admin.module.business.caseplatformcase.domain.entity.CaseplatformCaseEntity; @@ -22,8 +29,12 @@ import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.EasyExcel import net.lab1024.sa.admin.module.business.caseplatformcase.domain.vo.ExportExpertCaseExcelVo; import net.lab1024.sa.admin.module.business.caseplatformcaseabstrac.domain.vo.CaseplatformCaseAbstracVO; import net.lab1024.sa.admin.module.business.caseplatformcaseabstrac.service.CaseplatformCaseAbstracService; +import net.lab1024.sa.admin.module.business.caseplatformcasecheckdata.dao.CaseplatformCaseCheckdataDao; +import net.lab1024.sa.admin.module.business.caseplatformcasecheckdata.domain.entity.CaseplatformCaseCheckdataEntity; import net.lab1024.sa.admin.module.business.caseplatformcasecheckdata.domain.vo.CaseplatformCaseCheckdataVO; import net.lab1024.sa.admin.module.business.caseplatformcasecheckdata.service.CaseplatformCaseCheckdataService; +import net.lab1024.sa.admin.module.business.caseplatformcasedpms.dao.CaseplatformCaseDpmsDao; +import net.lab1024.sa.admin.module.business.caseplatformcasedpms.domain.entity.CaseplatformCaseDpmsEntity; import net.lab1024.sa.admin.module.business.caseplatformcasedpms.domain.vo.CaseplatformCaseDpmsVO; import net.lab1024.sa.admin.module.business.caseplatformcasedpms.service.CaseplatformCaseDpmsService; import net.lab1024.sa.admin.module.system.login.domain.LoginEmployeeDetail; @@ -80,6 +91,15 @@ public class CaseplatformCaseService { @Autowired private CasePlatformBankDao casePlatformBankDao; + @Autowired + private MedicalRecorDpmasDao medicalRecorDpmasDao; + + @Autowired + private MedicalRecorCheckDataDao medicalRecorCheckDataDao; + + @Autowired + private MedicalRecorDao medicalRecorDao; + // 创建 ObjectMapper 实例（建议使用 Spring 注入或静态常量） private static final ObjectMapper objectMapper = new ObjectMapper(); @@ -470,6 +490,81 @@ public class CaseplatformCaseService { * */ public ResponseDTO caseMainDiagnose(CaseMainDiagnoseForm form) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MedicalRecordEntity::getId,form.getCaseId()); + MedicalRecordEntity caseplatformCase = medicalRecorDao.selectOne(queryWrapper); + if (caseplatformCase == null) { + return ResponseDTO.userErrorParam("病例不存在"); + } + + if (caseplatformCase.getStatus() == 1){ + return ResponseDTO.userErrorParam("已通过审核，不允许修改"); + } + + if (!Objects.equals(caseplatformCase.getMainDiagnose(), form.getMainDiagnose())){ + caseplatformCase.setMainDiagnose(form.getMainDiagnose()); + medicalRecorDao.updateById(caseplatformCase); + } + + return ResponseDTO.ok(); + } + + /** + * 人工肝治疗图片修改 + */ + public ResponseDTO caseDpmasImg(CaseDpmasImgForm form) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MedicalRecordEntity::getId,form.getCaseId()); + MedicalRecordEntity caseplatformCase = medicalRecorDao.selectOne(queryWrapper); + if (caseplatformCase == null) { + return ResponseDTO.userErrorParam("病例不存在"); + } + + if (caseplatformCase.getStatus() == 1){ + return ResponseDTO.userErrorParam("已通过审核，不允许修改"); + } + + // 获取人工肝治疗信息 + MedicalRecordDpmsEntity caseplatformCaseDpm = medicalRecorDpmasDao.selectById(form.getDmpsId()); + if (caseplatformCaseDpm == null) { + return ResponseDTO.userErrorParam("病例不存在"); + } + + if (!Objects.equals(caseplatformCaseDpm.getDpmasImg(), form.getDpmasImg())){ + caseplatformCaseDpm.setDpmasImg(form.getDpmasImg()); + medicalRecorDpmasDao.updateById(caseplatformCaseDpm); + } + + return ResponseDTO.ok(); + } + + /** + * 实验室检测图片修改 + */ + public ResponseDTO caseCheckdataImg(CaseCheckdataImgForm form) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MedicalRecordEntity::getId,form.getCaseId()); + MedicalRecordEntity caseplatformCase = medicalRecorDao.selectOne(queryWrapper); + if (caseplatformCase == null) { + return ResponseDTO.userErrorParam("病例不存在"); + } + + if (caseplatformCase.getStatus() == 1){ + return ResponseDTO.userErrorParam("已通过审核，不允许修改"); + } + + // 获取实验室检测数据 + LambdaQueryWrapper checkDataQueryWrapper = new LambdaQueryWrapper<>(); + checkDataQueryWrapper.eq(MedicalRecordCheckdataEntity::getId,form.getCaseId()); + MedicalRecordCheckdataEntity caseplatformCaseCheckdata = medicalRecorCheckDataDao.selectOne(checkDataQueryWrapper); + if (caseplatformCaseCheckdata == null) { + return ResponseDTO.userErrorParam("病例不存在"); + } + + if (!Objects.equals(caseplatformCaseCheckdata.getCheckImg(), form.getCheckImg())){ + caseplatformCaseCheckdata.setCheckImg(form.getCheckImg()); + medicalRecorCheckDataDao.updateById(caseplatformCaseCheckdata); + } return ResponseDTO.ok(); } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcasecheckdata/domain/entity/CaseplatformCaseCheckdataEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcasecheckdata/domain/entity/CaseplatformCaseCheckdataEntity.java index 150b13d..ea9e5bc 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcasecheckdata/domain/entity/CaseplatformCaseCheckdataEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcasecheckdata/domain/entity/CaseplatformCaseCheckdataEntity.java @@ -142,7 +142,7 @@ public class CaseplatformCaseCheckdataEntity { /** * 图片 */ - private String img; + private String checkImg; /** * 创建时间