修改了后台新增员工时性别,修改了前台的出院状态

sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java

@@ -36,7 +36,7 @@ public class EmployeeAddForm {
 
     @ApiModelPropertyEnum(GenderEnum.class)
     @CheckEnum(value = GenderEnum.class, message = "性别错误")
-    private Integer gender;
+    private String gender;
 
     @ApiModelProperty("部门id")
     @NotNull(message = "部门id不能为空")

sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java

@@ -136,6 +136,9 @@ public class EmployeeService {
         // 设置密码 默认密码
         String password = randomPassword();
         entity.setLoginPwd(getEncryptPwd(password));
+        if (employeeAddForm.getGender() != null) {
+            entity.setGender(Integer.valueOf(employeeAddForm.getGender()));
+        }
 
         // 保存数据
         entity.setDeletedFlag(Boolean.FALSE);

sa-common/src/main/java/net/lab1024/sa/common/common/enumeration/DischargeStatusEnum.java

@@ -34,7 +34,12 @@ public enum DischargeStatusEnum implements BaseEnum {
     /**
      * 4 死亡
      */
-    D("4", "死亡");
+    D("4", "死亡"),
+
+    /**
+     * 5 移植
+     */
+    E("5", "移植");
 
     private final String value;