diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Company.java b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Company.java index d708678..66505e6 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Company.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Company.java @@ -1,7 +1,13 @@ package net.lab1024.sa.admin.extend.fangxinqian; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + /** * 企业账号 */ -public class Company { +@Slf4j +@Component +public class Company extends Base { + } diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Personal.java b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Personal.java index d55829a..413853c 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Personal.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/extend/fangxinqian/Personal.java @@ -1,7 +1,12 @@ package net.lab1024.sa.admin.extend.fangxinqian; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + /** * 个人账号 */ -public class Personal { +@Slf4j +@Component +public class Personal extends Base { } 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 fea7721..17a9bb1 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 @@ -322,7 +322,7 @@ public class MedicalRecordAddForm { @ApiModelPropertyEnum(DischargeStatusEnum.class) @CheckEnum(value = DischargeStatusEnum.class, message = "出院状态 错误") - private Integer dischargeStatus; + private String dischargeStatus; @ApiModelProperty(value = "疾病转归 出院情况", required = true) @NotBlank(message = "疾病转归 出院情况 不能为空") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordDetailVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordDetailVO.java index de72afe..64fac72 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordDetailVO.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordDetailVO.java @@ -316,7 +316,7 @@ public class MedicalRecordDetailVO { @ApiModelPropertyEnum(DischargeStatusEnum.class) @CheckEnum(value = DischargeStatusEnum.class, message = "出院状态 错误") - private Integer dischargeStatus; + private String dischargeStatus; @ApiModelProperty(value = "疾病转归 出院情况", required = true) @NotNull(message = "疾病转归 出院情况 不能为空") 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 7ba6654..c8889af 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 @@ -218,7 +218,7 @@ public class MedicalRecordService { medicalRecordPrognosis.setCaseId(medicalRecord.getId()); medicalRecordPrognosis.setDischargeTime(addForm.getDischargeTime()); medicalRecordPrognosis.setDay(Integer.valueOf(addForm.getDay())); - medicalRecordPrognosis.setDischargeStatus(addForm.getDischargeStatus()); + medicalRecordPrognosis.setDischargeStatus(Integer.valueOf(addForm.getDischargeStatus())); medicalRecordPrognosis.setDischargeSituation(addForm.getDischargeSituation()); res = medicalRecorPrognosisDao.insert(medicalRecordPrognosis); if (res <= 0){ @@ -360,7 +360,7 @@ public class MedicalRecordService { medicalRecordPrognosis.setDischargeTime(updateForm.getDischargeTime()); medicalRecordPrognosis.setDay(Integer.valueOf(updateForm.getDay())); - medicalRecordPrognosis.setDischargeStatus(updateForm.getDischargeStatus()); + medicalRecordPrognosis.setDischargeStatus(Integer.valueOf(updateForm.getDischargeStatus())); medicalRecordPrognosis.setDischargeSituation(updateForm.getDischargeSituation()); medicalRecorPrognosisDao.updateById(medicalRecordPrognosis); diff --git a/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java b/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java index 150b5f9..a6ac116 100644 --- a/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java +++ b/sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java @@ -19,24 +19,24 @@ public enum DischargeStatusEnum implements BaseEnum { /** * 1 好转 */ - A(1, "好转"), + A("1", "好转"), /** * 2 痊愈 */ - B(2, "痊愈"), + B("2", "痊愈"), /** * 3 恶化 */ - C(3, "恶化"), + C("3", "恶化"), /** * 4 死亡 */ - D(4, "死亡"); + D("4", "死亡"); - private final Integer value; + private final String value; private final String desc; }