ทะเบียนประวัติ: ข้อมูลส่วนตัว (เพิ่ม ยศ แก้ q-select)

src/modules/04_registryNew/interface/index/Main.ts

@@ -25,7 +25,7 @@ interface zipCodeOption {
 
 interface InformationOps {
   prefixOps: DataOption[];
-  prefixOldOps: DataOption[];
+  rankOps: DataOption[];
   genderOps: DataOption[];
   bloodOps: DataOption[];
   statusOps: DataOption[];

src/modules/04_registryNew/interface/request/Profile.ts

@@ -1,24 +1,25 @@
 interface RequestObject {
-  bloodGroupId: string | null;
-  relationshipId: string | null;
-  genderId: string | null;
-  posTypeId: string;
-  posLevelId: string;
-  religionId: string | null;
-  citizenId: string;
-  telephoneNumber: string | null;
-  // nationality: string | null;
-  ethnicity: string | null;
   birthDate: Date | null;
+  bloodGroup: string | null;
+  citizenId: string;
   dateRetire: Date | null;
+  email: string | null;
+  ethnicity: string | null;
+  firstName: string;
+  gender: string | null;
   isProbation: boolean;
   keycloak: string;
-  phone: string | null;
-  email: string | null;
-  position: string;
   lastName: string;
-  firstName: string;
+  nationality: string | null;
+  phone: string | null;
+  posLevelId: string;
+  posTypeId: string;
+  position: string;
   prefix: string;
+  rank: string | null;
+  relationship: string | null;
+  religion: string | null;
+  telephoneNumber: string | null;
 }
 
 export type { RequestObject };

src/modules/04_registryNew/interface/response/Profile.ts

@@ -1,38 +1,35 @@
 interface ResponseObject {
-  id: string;
-  createdAt: Date;
-  createdUserId: string;
-  lastUpdatedAt: Date;
-  lastUpdateUserId: string;
-  createdFullName: string;
-  lastUpdateFullName: string;
-  prefix: string;
-  firstName: string;
-  lastName: string;
+  birthDate: Date | null;
+  bloodGroup: string | null;
   citizenId: string;
-  position: string;
-  posLevelId: string | null;
-  posTypeId: string | null;
-  email: string | null;
-  phone: string | null;
-  keycloak: string | null;
-  isProbation: boolean;
+  createdAt: Date | null;
+  createdFullName: string;
+  createdUserId: string;
   dateRetire: Date | null;
-  birthDate: Date;
+  email: string | null;
   ethnicity: string | null;
-  religionId: string | null;
-  religion: Religion | null;
-  telephoneNumber: null | null;
-  genderId: string | null;
-  gender: Gender | null;
-  relationshipId: string | null;
-  relationship: Relationship | null;
-  bloodGroupId: string | null;
-  bloodGroup: BloodGroup | null;
+  firstName: string;
+  gender: string | null;
+  id: string;
+  isLeave: boolean;
+  isProbation: boolean;
+  keycloak: string | null;
+  lastName: string;
+  lastUpdateFullName: string;
+  lastUpdateUserId: string;
+  lastUpdatedAt: Date | null;
+  nationality: string | null;
+  phone: string | null;
   posLevel: PosLevel | null;
+  posLevelId: string | null;
   posType: PosType | null;
-
-  nationality?: string;
+  posTypeId: string | null;
+  position: string | null;
+  prefix: string;
+  rank: string | null
+  relationship: string | null;
+  religion: string | null;
+  telephoneNumber: string | null;
 }
 
 interface Religion {