diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java index bf5e56c..c3e3f28 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java @@ -55,6 +55,10 @@ public class MedicalRecordAddForm { @NotNull(message = "治疗类型 不能为空") private String caseType; + @ApiModelProperty(value = "治疗次数", required = true) + @NotNull(message = "治疗次数 不能为空") + private String treatmentNum; + @ApiModelProperty(value = "主要诊断", required = true) @NotBlank(message = "主要诊断 不能为空") private String mainDiagnose; diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordEntity.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordEntity.java index 76fa7b6..b7212d1 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordEntity.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordEntity.java @@ -43,6 +43,11 @@ public class MedicalRecordEntity { */ private String caseType; + /** + * 治疗次数 + */ + private String treatmentNum; + /** * 0待审核 1审核通过 2审核不通过 */ 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 00b5660..9ede8e2 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 @@ -154,6 +154,7 @@ public class MedicalRecordService { medicalRecord.setUserId(medicalRecordUser.getId()); medicalRecord.setAdmissionTime(addForm.getAdmissionTime()); medicalRecord.setCaseType(addForm.getCaseType()); + medicalRecord.setTreatmentNum(addForm.getTreatmentNum()); DateTime nowDate = DateUtil.date(); String statistics_date = DateUtil.format(nowDate, "yyyyMMdd"); @@ -310,6 +311,7 @@ public class MedicalRecordService { medicalRecord.setAdmissionTime(updateForm.getAdmissionTime()); medicalRecord.setCaseType(updateForm.getCaseType()); + medicalRecord.setTreatmentNum(updateForm.getTreatmentNum()); medicalRecord.setMainDiagnose(updateForm.getMainDiagnose()); medicalRecord.setDiseaseCause(updateForm.getDiseaseCause()); medicalRecord.setSeductionReason(updateForm.getSeductionReason()); 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 4416d44..94812b8 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 @@ -39,6 +39,11 @@ public class CaseplatformCaseEntity { */ private String caseType; + /** + * 治疗次数 + */ + private String treatmentNum; + /** * 专家 id */ diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java index 99146e8..c9dbfc7 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/CaseplatformCaseVO.java @@ -37,6 +37,9 @@ public class CaseplatformCaseVO { @ApiModelProperty(value = "治疗类型") private String caseType; + @ApiModelProperty(value = "治疗次数") + private String treatmentNum; + @ApiModelProperty(value = "专家姓名") private String expertName;