diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java index 9eff233..56f843a 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java @@ -221,9 +221,6 @@ public class MedicalRecordService { medicalRecordCheckdata.setHeadPta(addForm.getHeadPta()); medicalRecordCheckdata.setAfterPta(addForm.getAfterPta()); medicalRecordCheckdata.setLastPta(addForm.getLastPta()); - medicalRecordCheckdata.setHeadIb(addForm.getHeadIb()); - medicalRecordCheckdata.setAfterIb(addForm.getAfterIb()); - medicalRecordCheckdata.setLastIb(addForm.getLastIb()); medicalRecordCheckdata.setHeadInr(addForm.getHeadInr()); medicalRecordCheckdata.setAfterInr(addForm.getAfterInr()); medicalRecordCheckdata.setLastInr(addForm.getLastInr()); @@ -240,7 +237,9 @@ public class MedicalRecordService { medicalRecordCheckdata.setHeadTnf(addForm.getHeadTnf()); medicalRecordCheckdata.setAfterTnf(addForm.getAfterTnf()); medicalRecordCheckdata.setLastTnf(addForm.getLastTnf()); - medicalRecordCheckdata.setCheckImg(addForm.getCheckImg()); + medicalRecordCheckdata.setBioImg(addForm.getBioImg()); + medicalRecordCheckdata.setInfImg(addForm.getInfImg()); + medicalRecordCheckdata.setCoaImg(addForm.getCoaImg()); medicalRecordCheckdata.setCreateTime(LocalDateTime.now()); res = medicalRecorCheckDataDao.insert(medicalRecordCheckdata); if (res <= 0){ @@ -378,9 +377,6 @@ public class MedicalRecordService { medicalRecordCheckData.setHeadPta(updateForm.getHeadPta()); medicalRecordCheckData.setAfterPta(updateForm.getAfterPta()); medicalRecordCheckData.setLastPta(updateForm.getLastPta()); - medicalRecordCheckData.setHeadIb(updateForm.getHeadIb()); - medicalRecordCheckData.setAfterIb(updateForm.getAfterIb()); - medicalRecordCheckData.setLastIb(updateForm.getLastIb()); medicalRecordCheckData.setHeadInr(updateForm.getHeadInr()); medicalRecordCheckData.setAfterInr(updateForm.getAfterInr()); medicalRecordCheckData.setLastInr(updateForm.getLastInr()); @@ -397,7 +393,9 @@ public class MedicalRecordService { medicalRecordCheckData.setHeadTnf(updateForm.getHeadTnf()); medicalRecordCheckData.setAfterTnf(updateForm.getAfterTnf()); medicalRecordCheckData.setLastTnf(updateForm.getLastTnf()); - medicalRecordCheckData.setCheckImg(updateForm.getCheckImg()); + medicalRecordCheckData.setBioImg(updateForm.getBioImg()); + medicalRecordCheckData.setInfImg(updateForm.getInfImg()); + medicalRecordCheckData.setCoaImg(updateForm.getCoaImg()); medicalRecorCheckDataDao.updateById(medicalRecordCheckData); // 疾病转归 @@ -694,12 +692,27 @@ public class MedicalRecordService { // 实验室检测 public ResponseDTO checkData(MedicalRecordUpdateForm form, Long expertId){ - String checkImg = form.getCheckImg(); - String[] checkImgNum = checkImg.split(","); - if(checkImgNum.length > 6){ - return ResponseDTO.userErrorParam("实验室检测照片应为(1-6张)!"); + String bioImg = form.getBioImg(); + String[] checkBioImgNum = bioImg.split(","); + if(checkBioImgNum.length > 3){ + return ResponseDTO.userErrorParam("生化指标照片应为(1-3张)!"); } + String coaImg = form.getCoaImg(); + String[] checkCoaImgNum = coaImg.split(","); + if(checkCoaImgNum.length > 3){ + return ResponseDTO.userErrorParam("凝血功能指标照片应为(1-3张)!"); + } + + if (form.getInfImg() != null) { + String infImg = form.getInfImg(); + String[] checkInfImgNum = infImg.split(","); + if(checkInfImgNum.length > 3){ + return ResponseDTO.userErrorParam("炎症因子指标照片应为(1-3张)!"); + } + } + + return ResponseDTO.app_ok(); } 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 index df54a6f..b366bef 100644 --- 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 @@ -3,6 +3,7 @@ package net.lab1024.sa.admin.module.business.caseplatformcase.domain.form; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Data @@ -11,7 +12,14 @@ public class CaseCheckdataImgForm { @NotNull(message = "病例 不能为空") private String caseId; - @ApiModelProperty(value = "检测图片", required = true) - @NotNull(message = "检测图片 不能为空") - private String checkImg; + @ApiModelProperty(value = "生化指标 图片", required = true) + @NotNull(message = "报告单 生化指标 不能为空") + private String bioImg; + + @ApiModelProperty(value = "凝血功能指标 图片", required = true) + @NotNull(message = "报告单 凝血功能指标 不能为空") + private String coaImg; + + @ApiModelProperty(value = "炎症因子指标 图片") + private String infImg; } 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 a25d54b..522c0b4 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 @@ -620,11 +620,22 @@ public class CaseplatformCaseService { return ResponseDTO.userErrorParam("病例不存在"); } - if (!Objects.equals(caseplatformCaseCheckdata.getCheckImg(), form.getCheckImg())){ - caseplatformCaseCheckdata.setCheckImg(form.getCheckImg()); - medicalRecorCheckDataDao.updateById(caseplatformCaseCheckdata); + if (!Objects.equals(caseplatformCaseCheckdata.getBioImg(), form.getBioImg())){ + caseplatformCaseCheckdata.setBioImg(form.getBioImg()); } + if (!Objects.equals(caseplatformCaseCheckdata.getCoaImg(), form.getCoaImg())){ + caseplatformCaseCheckdata.setCoaImg(form.getCoaImg()); + } + + if (form.getInfImg() != null) { + if (!Objects.equals(caseplatformCaseCheckdata.getInfImg(), form.getInfImg())){ + caseplatformCaseCheckdata.setInfImg(form.getInfImg()); + } + } + + medicalRecorCheckDataDao.updateById(caseplatformCaseCheckdata); + return ResponseDTO.ok(); }