修改申请职位code

src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@@ -213,9 +213,18 @@ public class QuestionnaireService implements IQuestionnaireService{
         accountManage.setId(snowflake.nextId());
         accountManage.setHospitalName(param.getName());
         accountManage.setDepartmentName(param.getDepartmentName());
-        accountManage.setDepartmentCode(Constant.DepartmentAndCode.getDepartmentCode(param.getDepartmentName()));
+        // 从Constant常量中获取部门code
+        String departmentCode = Constant.DepartmentAndCode.getDepartmentCode(param.getDepartmentName());
+        accountManage.setDepartmentCode(departmentCode);
         accountManage.setPositionName(param.getPositionName());
-        accountManage.setPositionCode(Constant.PositionIdAndRole.getPositionCode(param.getPositionName()));
+        String positionCode = Constant.PositionIdAndRole.of(param.getPositionName());
+        // 如果是医生则为部门code+职位code
+        accountManage.setPositionCode(positionCode);
+        assert positionCode != null;
+        if (positionCode.equals(Constant.PositionIdAndRole.YiSheng.positionCode)) {
+            accountManage.setPositionCode(departmentCode+positionCode);
+        }
+
         accountManage.setSubmitter(param.getSubmitter());
         accountManage.setSubmitterPhone(param.getPhone());
         accountManage.setSubmitterUserId(userId);

src/main/java/com/ccsens/carbasics/util/Constant.java

@@ -287,7 +287,7 @@ public class Constant {
             }else if(SHEN_WAI.name.equals(name)) {
                 return SHEN_WAI.code;
             }else if (NEI_KE.name.equals(name)) {
-                return NEI_KE.code;
+                return SHEN_NEI.code;
             }
             return null;
         }
@@ -425,6 +425,14 @@ public class Constant {
             }
             return null;
         }
+        public static String of(String roleName) {
+            for (PositionIdAndRole value : PositionIdAndRole.values()) {
+                if (roleName.equals(value.roleName)) {
+                    return value.positionCode;
+                }
+            }
+            return null;
+        }
     }
     public enum DataStatus {
         /**