编外医生接诊

src/main/java/cn/hnthyy/thmz/controller/mz/LoginController.java

@@ -90,7 +90,8 @@ public class LoginController {
             resultMap.put("message", "登录失败,系统发生未知错误，请重稍后重试或联系管理员");
             return resultMap;
         }
-        if (!WorkingStatusEnum.WORKING.code.equals(user.getStatus())) {
+        //在职和编外
+        if (!(WorkingStatusEnum.WORKING.code.equals(user.getStatus()) || WorkingStatusEnum.RETIRE.code.equals(user.getStatus()))) {
             resultMap.put("code", -1);
             resultMap.put("message", "登录失败,账号状态为非在职，请联系管理员");
             return resultMap;

src/main/java/cn/hnthyy/thmz/enums/WorkingStatusEnum.java

@@ -10,7 +10,7 @@ public enum WorkingStatusEnum {
     WORKING(1, "在职"),
     UNPAID_LEAVE(2, "退休"),
     LEAVE(3, "调离"),
-    RETIRE(4, "编码"),
+    RETIRE(4, "编外"),
     LIXIU(5, "离休"),
     CHUGUO(6, "出国"),
     LIUDONG(7, "流动"),

src/main/java/cn/hnthyy/thmz/mapper/his/mz/EmployeeMapper.java

@@ -13,7 +13,7 @@ public interface EmployeeMapper {
      * @param codeRs
      * @return
      */
-    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark,emp_tit_code,rtrim(code_rs)  code_rs,rtrim(dept_code) dept_code from a_employee_mi  where  code_rs =#{codeRs}")
+    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark,emp_tit_code,rtrim(code_rs)  code_rs,rtrim(dept_code) dept_code from a_employee_mi  where  code_rs =#{codeRs} order by mark")
     Employee selectByCodeRs(@Param("codeRs") String codeRs);