@blackcode_sa/metaestetics-api 1.6.20 → 1.6.22

package/dist/index.js

@@ -58,6 +58,7 @@ __export(index_exports, {
   Contraindication: () => Contraindication,
   CosmeticAllergySubtype: () => CosmeticAllergySubtype,
   Currency: () => Currency,
+  DOCTOR_FORMS_SUBCOLLECTION: () => DOCTOR_FORMS_SUBCOLLECTION,
   DOCUMENTATION_TEMPLATES_COLLECTION: () => DOCUMENTATION_TEMPLATES_COLLECTION,
   DocumentElementType: () => DocumentElementType,
   DocumentationTemplateService: () => DocumentationTemplateService,
@@ -112,6 +113,7 @@ __export(index_exports, {
   TimeUnit: () => TimeUnit,
   TreatmentBenefit: () => TreatmentBenefit,
   USER_ERRORS: () => USER_ERRORS,
+  USER_FORMS_SUBCOLLECTION: () => USER_FORMS_SUBCOLLECTION,
   UserService: () => UserService,
   addAllergySchema: () => addAllergySchema,
   addBlockingConditionSchema: () => addBlockingConditionSchema,
@@ -305,17 +307,17 @@ var HeadingLevel = /* @__PURE__ */ ((HeadingLevel2) => {
   return HeadingLevel2;
 })(HeadingLevel || {});
 var DynamicVariable = /* @__PURE__ */ ((DynamicVariable2) => {
-  DynamicVariable2["PATIENT_NAME"] = "[PATIENT_NAME]";
-  DynamicVariable2["DOCTOR_NAME"] = "[DOCTOR_NAME]";
-  DynamicVariable2["CLINIC_NAME"] = "[CLINIC_NAME]";
-  DynamicVariable2["PATIENT_BIRTHDAY"] = "[PATIENT_BIRTHDAY]";
-  DynamicVariable2["APPOINTMENT_DATE"] = "[APPOINTMENT_DATE]";
-  DynamicVariable2["CURRENT_DATE"] = "[CURRENT_DATE]";
-  DynamicVariable2["PROCEDURE_NAME"] = "[PROCEDURE_NAME]";
-  DynamicVariable2["PROCEDURE_DESCRIPTION"] = "[PROCEDURE_DESCRIPTION]";
-  DynamicVariable2["PROCEDURE_COST"] = "[PROCEDURE_COST]";
-  DynamicVariable2["PROCEDURE_DURATION"] = "[PROCEDURE_DURATION]";
-  DynamicVariable2["PROCEDURE_RISK"] = "[PROCEDURE_RISK]";
+  DynamicVariable2["PATIENT_NAME"] = "$[PATIENT_NAME]";
+  DynamicVariable2["DOCTOR_NAME"] = "$[DOCTOR_NAME]";
+  DynamicVariable2["CLINIC_NAME"] = "$[CLINIC_NAME]";
+  DynamicVariable2["PATIENT_BIRTHDAY"] = "$[PATIENT_BIRTHDAY]";
+  DynamicVariable2["APPOINTMENT_DATE"] = "$[APPOINTMENT_DATE]";
+  DynamicVariable2["CURRENT_DATE"] = "$[CURRENT_DATE]";
+  DynamicVariable2["PROCEDURE_NAME"] = "$[PROCEDURE_NAME]";
+  DynamicVariable2["PROCEDURE_DESCRIPTION"] = "$[PROCEDURE_DESCRIPTION]";
+  DynamicVariable2["PROCEDURE_COST"] = "$[PROCEDURE_COST]";
+  DynamicVariable2["PROCEDURE_DURATION"] = "$[PROCEDURE_DURATION]";
+  DynamicVariable2["PROCEDURE_RISK"] = "$[PROCEDURE_RISK]";
   return DynamicVariable2;
 })(DynamicVariable || {});
 var FilledDocumentStatus = /* @__PURE__ */ ((FilledDocumentStatus2) => {
@@ -1332,11 +1334,11 @@ var allergySubtypeSchema = import_zod5.z.union([
 var allergySchema = import_zod5.z.object({
   type: import_zod5.z.nativeEnum(AllergyType),
   subtype: allergySubtypeSchema,
-  name: import_zod5.z.string().optional(),
+  name: import_zod5.z.string().optional().nullable(),
   severity: import_zod5.z.enum(["mild", "moderate", "severe"]).optional(),
-  reaction: import_zod5.z.string().optional(),
-  diagnosed: timestampSchema2.optional(),
-  notes: import_zod5.z.string().optional()
+  reaction: import_zod5.z.string().optional().nullable(),
+  diagnosed: timestampSchema2.optional().nullable(),
+  notes: import_zod5.z.string().optional().nullable()
 });
 var vitalStatsSchema = import_zod5.z.object({
   height: import_zod5.z.number().positive().optional(),
@@ -1351,23 +1353,23 @@ var vitalStatsSchema = import_zod5.z.object({
 var blockingConditionSchema = import_zod5.z.object({
   condition: import_zod5.z.nativeEnum(BlockingCondition),
   diagnosedAt: timestampSchema2,
-  notes: import_zod5.z.string().optional(),
+  notes: import_zod5.z.string().optional().nullable(),
   isActive: import_zod5.z.boolean()
 });
 var contraindicationSchema = import_zod5.z.object({
   condition: import_zod5.z.nativeEnum(Contraindication),
   lastOccurrence: timestampSchema2,
   frequency: import_zod5.z.enum(["rare", "occasional", "frequent"]),
-  notes: import_zod5.z.string().optional(),
+  notes: import_zod5.z.string().optional().nullable(),
   isActive: import_zod5.z.boolean()
 });
 var medicationSchema = import_zod5.z.object({
   name: import_zod5.z.string().min(1),
   dosage: import_zod5.z.string().min(1),
   frequency: import_zod5.z.string().min(1),
-  startDate: timestampSchema2,
-  endDate: timestampSchema2.optional(),
-  prescribedBy: import_zod5.z.string().optional()
+  startDate: timestampSchema2.optional().nullable(),
+  endDate: timestampSchema2.optional().nullable(),
+  prescribedBy: import_zod5.z.string().optional().nullable()
 });
 var patientMedicalInfoSchema = import_zod5.z.object({
   patientId: import_zod5.z.string(),
@@ -7862,7 +7864,7 @@ var ProcedureService = class extends BaseService {
       preRequirements: technology.requirements.pre,
       postRequirements: technology.requirements.post,
       certificationRequirement: technology.certificationRequirement,
-      documentationTemplates: technology.documentationTemplates || [],
+      documentationTemplates: (technology == null ? void 0 : technology.documentationTemplates) || [],
       clinicInfo,
       // Embed aggregated info
       doctorInfo,
@@ -8441,6 +8443,7 @@ var DocumentationTemplateService = class extends BaseService {
    * @returns The updated template
    */
   async updateTemplate(templateId, data) {
+    var _a, _b, _c, _d, _e, _f;
     const validatedData = updateDocumentTemplateSchema.parse(data);
     const template = await this.getTemplateById(templateId);
     if (!template) {
@@ -8466,12 +8469,9 @@ var DocumentationTemplateService = class extends BaseService {
       updatePayload.isActive = validatedData.isActive;
     if (validatedData.tags !== void 0)
       updatePayload.tags = validatedData.tags;
-    if (validatedData.isUserForm !== void 0)
-      updatePayload.isUserForm = validatedData.isUserForm;
-    if (validatedData.isRequired !== void 0)
-      updatePayload.isRequired = validatedData.isRequired;
-    if (validatedData.sortingOrder !== void 0)
-      updatePayload.sortingOrder = validatedData.sortingOrder;
+    updatePayload.isUserForm = (_b = (_a = validatedData.isUserForm) != null ? _a : template.isUserForm) != null ? _b : false;
+    updatePayload.isRequired = (_d = (_c = validatedData.isRequired) != null ? _c : template.isRequired) != null ? _d : false;
+    updatePayload.sortingOrder = (_f = (_e = validatedData.sortingOrder) != null ? _e : template.sortingOrder) != null ? _f : 0;
     const docRef = (0, import_firestore25.doc)(this.collectionRef, templateId);
     await (0, import_firestore25.updateDoc)(docRef, updatePayload);
     return { ...template, ...updatePayload };
@@ -8571,6 +8571,30 @@ var DocumentationTemplateService = class extends BaseService {
       lastDoc: lastVisible
     };
   }
+  /**
+   * Get all templates for selection with optional filtering
+   * @param options - Filtering options
+   * @returns Array of templates
+   */
+  async getAllTemplatesForSelection(options) {
+    let q = (0, import_firestore25.query)(
+      this.collectionRef,
+      (0, import_firestore25.where)("isActive", "==", true),
+      (0, import_firestore25.orderBy)("updatedAt", "desc")
+    );
+    if ((options == null ? void 0 : options.isUserForm) !== void 0) {
+      q = (0, import_firestore25.query)(q, (0, import_firestore25.where)("isUserForm", "==", options.isUserForm));
+    }
+    if ((options == null ? void 0 : options.isRequired) !== void 0) {
+      q = (0, import_firestore25.query)(q, (0, import_firestore25.where)("isRequired", "==", options.isRequired));
+    }
+    const querySnapshot = await (0, import_firestore25.getDocs)(q);
+    const templates = [];
+    querySnapshot.forEach((doc33) => {
+      templates.push(doc33.data());
+    });
+    return templates;
+  }
 };
 
 // src/services/documentation-templates/filled-document.service.ts
@@ -14337,6 +14361,7 @@ var RequirementType = /* @__PURE__ */ ((RequirementType2) => {
   Contraindication,
   CosmeticAllergySubtype,
   Currency,
+  DOCTOR_FORMS_SUBCOLLECTION,
   DOCUMENTATION_TEMPLATES_COLLECTION,
   DocumentElementType,
   DocumentationTemplateService,
@@ -14391,6 +14416,7 @@ var RequirementType = /* @__PURE__ */ ((RequirementType2) => {
   TimeUnit,
   TreatmentBenefit,
   USER_ERRORS,
+  USER_FORMS_SUBCOLLECTION,
   UserService,
   addAllergySchema,
   addBlockingConditionSchema,

package/dist/index.mjs

@@ -71,17 +71,17 @@ var HeadingLevel = /* @__PURE__ */ ((HeadingLevel2) => {
   return HeadingLevel2;
 })(HeadingLevel || {});
 var DynamicVariable = /* @__PURE__ */ ((DynamicVariable2) => {
-  DynamicVariable2["PATIENT_NAME"] = "[PATIENT_NAME]";
-  DynamicVariable2["DOCTOR_NAME"] = "[DOCTOR_NAME]";
-  DynamicVariable2["CLINIC_NAME"] = "[CLINIC_NAME]";
-  DynamicVariable2["PATIENT_BIRTHDAY"] = "[PATIENT_BIRTHDAY]";
-  DynamicVariable2["APPOINTMENT_DATE"] = "[APPOINTMENT_DATE]";
-  DynamicVariable2["CURRENT_DATE"] = "[CURRENT_DATE]";
-  DynamicVariable2["PROCEDURE_NAME"] = "[PROCEDURE_NAME]";
-  DynamicVariable2["PROCEDURE_DESCRIPTION"] = "[PROCEDURE_DESCRIPTION]";
-  DynamicVariable2["PROCEDURE_COST"] = "[PROCEDURE_COST]";
-  DynamicVariable2["PROCEDURE_DURATION"] = "[PROCEDURE_DURATION]";
-  DynamicVariable2["PROCEDURE_RISK"] = "[PROCEDURE_RISK]";
+  DynamicVariable2["PATIENT_NAME"] = "$[PATIENT_NAME]";
+  DynamicVariable2["DOCTOR_NAME"] = "$[DOCTOR_NAME]";
+  DynamicVariable2["CLINIC_NAME"] = "$[CLINIC_NAME]";
+  DynamicVariable2["PATIENT_BIRTHDAY"] = "$[PATIENT_BIRTHDAY]";
+  DynamicVariable2["APPOINTMENT_DATE"] = "$[APPOINTMENT_DATE]";
+  DynamicVariable2["CURRENT_DATE"] = "$[CURRENT_DATE]";
+  DynamicVariable2["PROCEDURE_NAME"] = "$[PROCEDURE_NAME]";
+  DynamicVariable2["PROCEDURE_DESCRIPTION"] = "$[PROCEDURE_DESCRIPTION]";
+  DynamicVariable2["PROCEDURE_COST"] = "$[PROCEDURE_COST]";
+  DynamicVariable2["PROCEDURE_DURATION"] = "$[PROCEDURE_DURATION]";
+  DynamicVariable2["PROCEDURE_RISK"] = "$[PROCEDURE_RISK]";
   return DynamicVariable2;
 })(DynamicVariable || {});
 var FilledDocumentStatus = /* @__PURE__ */ ((FilledDocumentStatus2) => {
@@ -1149,11 +1149,11 @@ var allergySubtypeSchema = z5.union([
 var allergySchema = z5.object({
   type: z5.nativeEnum(AllergyType),
   subtype: allergySubtypeSchema,
-  name: z5.string().optional(),
+  name: z5.string().optional().nullable(),
   severity: z5.enum(["mild", "moderate", "severe"]).optional(),
-  reaction: z5.string().optional(),
-  diagnosed: timestampSchema2.optional(),
-  notes: z5.string().optional()
+  reaction: z5.string().optional().nullable(),
+  diagnosed: timestampSchema2.optional().nullable(),
+  notes: z5.string().optional().nullable()
 });
 var vitalStatsSchema = z5.object({
   height: z5.number().positive().optional(),
@@ -1168,23 +1168,23 @@ var vitalStatsSchema = z5.object({
 var blockingConditionSchema = z5.object({
   condition: z5.nativeEnum(BlockingCondition),
   diagnosedAt: timestampSchema2,
-  notes: z5.string().optional(),
+  notes: z5.string().optional().nullable(),
   isActive: z5.boolean()
 });
 var contraindicationSchema = z5.object({
   condition: z5.nativeEnum(Contraindication),
   lastOccurrence: timestampSchema2,
   frequency: z5.enum(["rare", "occasional", "frequent"]),
-  notes: z5.string().optional(),
+  notes: z5.string().optional().nullable(),
   isActive: z5.boolean()
 });
 var medicationSchema = z5.object({
   name: z5.string().min(1),
   dosage: z5.string().min(1),
   frequency: z5.string().min(1),
-  startDate: timestampSchema2,
-  endDate: timestampSchema2.optional(),
-  prescribedBy: z5.string().optional()
+  startDate: timestampSchema2.optional().nullable(),
+  endDate: timestampSchema2.optional().nullable(),
+  prescribedBy: z5.string().optional().nullable()
 });
 var patientMedicalInfoSchema = z5.object({
   patientId: z5.string(),
@@ -7839,7 +7839,7 @@ var ProcedureService = class extends BaseService {
       preRequirements: technology.requirements.pre,
       postRequirements: technology.requirements.post,
       certificationRequirement: technology.certificationRequirement,
-      documentationTemplates: technology.documentationTemplates || [],
+      documentationTemplates: (technology == null ? void 0 : technology.documentationTemplates) || [],
       clinicInfo,
       // Embed aggregated info
       doctorInfo,
@@ -8431,6 +8431,7 @@ var DocumentationTemplateService = class extends BaseService {
    * @returns The updated template
    */
   async updateTemplate(templateId, data) {
+    var _a, _b, _c, _d, _e, _f;
     const validatedData = updateDocumentTemplateSchema.parse(data);
     const template = await this.getTemplateById(templateId);
     if (!template) {
@@ -8456,12 +8457,9 @@ var DocumentationTemplateService = class extends BaseService {
       updatePayload.isActive = validatedData.isActive;
     if (validatedData.tags !== void 0)
       updatePayload.tags = validatedData.tags;
-    if (validatedData.isUserForm !== void 0)
-      updatePayload.isUserForm = validatedData.isUserForm;
-    if (validatedData.isRequired !== void 0)
-      updatePayload.isRequired = validatedData.isRequired;
-    if (validatedData.sortingOrder !== void 0)
-      updatePayload.sortingOrder = validatedData.sortingOrder;
+    updatePayload.isUserForm = (_b = (_a = validatedData.isUserForm) != null ? _a : template.isUserForm) != null ? _b : false;
+    updatePayload.isRequired = (_d = (_c = validatedData.isRequired) != null ? _c : template.isRequired) != null ? _d : false;
+    updatePayload.sortingOrder = (_f = (_e = validatedData.sortingOrder) != null ? _e : template.sortingOrder) != null ? _f : 0;
     const docRef = doc16(this.collectionRef, templateId);
     await updateDoc16(docRef, updatePayload);
     return { ...template, ...updatePayload };
@@ -8561,6 +8559,30 @@ var DocumentationTemplateService = class extends BaseService {
       lastDoc: lastVisible
     };
   }
+  /**
+   * Get all templates for selection with optional filtering
+   * @param options - Filtering options
+   * @returns Array of templates
+   */
+  async getAllTemplatesForSelection(options) {
+    let q = query16(
+      this.collectionRef,
+      where16("isActive", "==", true),
+      orderBy5("updatedAt", "desc")
+    );
+    if ((options == null ? void 0 : options.isUserForm) !== void 0) {
+      q = query16(q, where16("isUserForm", "==", options.isUserForm));
+    }
+    if ((options == null ? void 0 : options.isRequired) !== void 0) {
+      q = query16(q, where16("isRequired", "==", options.isRequired));
+    }
+    const querySnapshot = await getDocs16(q);
+    const templates = [];
+    querySnapshot.forEach((doc33) => {
+      templates.push(doc33.data());
+    });
+    return templates;
+  }
 };
 
 // src/services/documentation-templates/filled-document.service.ts
@@ -14504,6 +14526,7 @@ export {
   Contraindication,
   CosmeticAllergySubtype,
   Currency,
+  DOCTOR_FORMS_SUBCOLLECTION,
   DOCUMENTATION_TEMPLATES_COLLECTION,
   DocumentElementType,
   DocumentationTemplateService,
@@ -14558,6 +14581,7 @@ export {
   TimeUnit,
   TreatmentBenefit,
   USER_ERRORS,
+  USER_FORMS_SUBCOLLECTION,
   UserService,
   addAllergySchema,
   addBlockingConditionSchema,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.6.20",
+  "version": "1.6.22",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/admin/aggregation/appointment/appointment.aggregation.service.ts

@@ -608,7 +608,8 @@ export class AppointmentAggregationService {
           return instructionObject;
         });
 
-        const newInstanceData: Omit<PatientRequirementInstance, "id"> = {
+        const newInstanceData: PatientRequirementInstance = {
+          id: newInstanceRef.id, // Add the ID to the document data
           patientId: appointment.patientId,
           appointmentId: appointment.id,
           originalRequirementId: template.id,

package/src/index.ts

@@ -299,6 +299,20 @@ export type {
   UpdateDocumentTemplateData,
   DocumentElement,
   FilledDocument,
+  BaseDocumentElement,
+  HeadingElement,
+  ParagraphElement,
+  ListElement,
+  DynamicTextElement,
+  BinaryChoiceElement,
+  MultipleChoiceElement,
+  SingleChoiceElement,
+  RatingScaleElement,
+  TextInputElement,
+  DatePickerElement,
+  SignatureElement,
+  DigitalSignatureElement,
+  FileUploadElement,
 } from "./types/documentation-templates";
 export {
   DocumentElementType,
@@ -306,11 +320,11 @@ export {
   ListType,
   DynamicVariable,
   FilledDocumentStatus,
-} from "./types/documentation-templates";
-export {
   DOCUMENTATION_TEMPLATES_COLLECTION,
   FILLED_DOCUMENTS_COLLECTION,
-} from "./types";
+  USER_FORMS_SUBCOLLECTION,
+  DOCTOR_FORMS_SUBCOLLECTION,
+} from "./types/documentation-templates";
 
 // Procedure types
 export type {

package/src/services/documentation-templates/documentation-template.service.ts

@@ -144,12 +144,14 @@ export class DocumentationTemplateService extends BaseService {
       updatePayload.isActive = validatedData.isActive;
     if (validatedData.tags !== undefined)
       updatePayload.tags = validatedData.tags;
-    if (validatedData.isUserForm !== undefined)
-      updatePayload.isUserForm = validatedData.isUserForm;
-    if (validatedData.isRequired !== undefined)
-      updatePayload.isRequired = validatedData.isRequired;
-    if (validatedData.sortingOrder !== undefined)
-      updatePayload.sortingOrder = validatedData.sortingOrder;
+
+    // Always include these properties with defaults if they're missing
+    updatePayload.isUserForm =
+      validatedData.isUserForm ?? template.isUserForm ?? false;
+    updatePayload.isRequired =
+      validatedData.isRequired ?? template.isRequired ?? false;
+    updatePayload.sortingOrder =
+      validatedData.sortingOrder ?? template.sortingOrder ?? 0;
 
     const docRef = doc(this.collectionRef, templateId);
     await updateDoc(docRef, updatePayload);
@@ -287,4 +289,37 @@ export class DocumentationTemplateService extends BaseService {
       lastDoc: lastVisible,
     };
   }
+
+  /**
+   * Get all templates for selection with optional filtering
+   * @param options - Filtering options
+   * @returns Array of templates
+   */
+  async getAllTemplatesForSelection(options?: {
+    isUserForm?: boolean;
+    isRequired?: boolean;
+  }): Promise<DocumentTemplate[]> {
+    let q = query(
+      this.collectionRef,
+      where("isActive", "==", true),
+      orderBy("updatedAt", "desc")
+    );
+
+    if (options?.isUserForm !== undefined) {
+      q = query(q, where("isUserForm", "==", options.isUserForm));
+    }
+
+    if (options?.isRequired !== undefined) {
+      q = query(q, where("isRequired", "==", options.isRequired));
+    }
+
+    const querySnapshot = await getDocs(q);
+    const templates: DocumentTemplate[] = [];
+
+    querySnapshot.forEach((doc) => {
+      templates.push(doc.data() as DocumentTemplate);
+    });
+
+    return templates;
+  }
 }

package/src/services/procedure/procedure.service.ts

@@ -184,7 +184,7 @@ export class ProcedureService extends BaseService {
       preRequirements: technology.requirements.pre,
       postRequirements: technology.requirements.post,
       certificationRequirement: technology.certificationRequirement,
-      documentationTemplates: technology.documentationTemplates || [],
+      documentationTemplates: technology?.documentationTemplates || [],
       clinicInfo, // Embed aggregated info
       doctorInfo, // Embed aggregated info
       reviewInfo: {

package/src/types/documentation-templates/index.ts

@@ -57,17 +57,17 @@ export enum HeadingLevel {
  * Enum for dynamic variable placeholders
  */
 export enum DynamicVariable {
-  PATIENT_NAME = "[PATIENT_NAME]",
-  DOCTOR_NAME = "[DOCTOR_NAME]",
-  CLINIC_NAME = "[CLINIC_NAME]",
-  PATIENT_BIRTHDAY = "[PATIENT_BIRTHDAY]",
-  APPOINTMENT_DATE = "[APPOINTMENT_DATE]",
-  CURRENT_DATE = "[CURRENT_DATE]",
-  PROCEDURE_NAME = "[PROCEDURE_NAME]",
-  PROCEDURE_DESCRIPTION = "[PROCEDURE_DESCRIPTION]",
-  PROCEDURE_COST = "[PROCEDURE_COST]",
-  PROCEDURE_DURATION = "[PROCEDURE_DURATION]",
-  PROCEDURE_RISK = "[PROCEDURE_RISK]",
+  PATIENT_NAME = "$[PATIENT_NAME]",
+  DOCTOR_NAME = "$[DOCTOR_NAME]",
+  CLINIC_NAME = "$[CLINIC_NAME]",
+  PATIENT_BIRTHDAY = "$[PATIENT_BIRTHDAY]",
+  APPOINTMENT_DATE = "$[APPOINTMENT_DATE]",
+  CURRENT_DATE = "$[CURRENT_DATE]",
+  PROCEDURE_NAME = "$[PROCEDURE_NAME]",
+  PROCEDURE_DESCRIPTION = "$[PROCEDURE_DESCRIPTION]",
+  PROCEDURE_COST = "$[PROCEDURE_COST]",
+  PROCEDURE_DURATION = "$[PROCEDURE_DURATION]",
+  PROCEDURE_RISK = "$[PROCEDURE_RISK]",
 }
 
 /**

package/src/types/patient/medical-info.types.ts

@@ -8,11 +8,11 @@ export const PATIENT_MEDICAL_INFO_COLLECTION = "medical_info";
 export interface Allergy {
   type: AllergyType;
   subtype: AllergySubtype;
-  name?: string;
-  severity?: "mild" | "moderate" | "severe";
-  reaction?: string;
-  diagnosed?: Timestamp;
-  notes?: string;
+  name?: string | null;
+  severity?: "mild" | "moderate" | "severe" | null;
+  reaction?: string | null;
+  diagnosed?: Timestamp | null;
+  notes?: string | null;
 }
 
 export interface VitalStats {
@@ -51,9 +51,9 @@ export interface PatientMedicalInfo {
     name: string;
     dosage: string;
     frequency: string;
-    startDate: Timestamp;
-    endDate?: Timestamp;
-    prescribedBy?: string;
+    startDate?: Timestamp | null;
+    endDate?: Timestamp | null;
+    prescribedBy?: string | null;
   }[];
 
   emergencyNotes?: string;
@@ -87,11 +87,11 @@ export interface UpdateVitalStatsData {
 export interface AddAllergyData {
   type: AllergyType;
   subtype: AllergySubtype;
-  name?: string;
+  name?: string | null;
   severity?: "mild" | "moderate" | "severe";
-  reaction?: string;
-  diagnosed?: Timestamp;
-  notes?: string;
+  reaction?: string | null;
+  diagnosed?: Timestamp | null;
+  notes?: string | null;
 }
 
 export interface UpdateAllergyData extends Partial<AddAllergyData> {

package/src/validations/patient/medical-info.schema.ts

@@ -21,11 +21,11 @@ export const allergySubtypeSchema = z.union([
 export const allergySchema = z.object({
   type: z.nativeEnum(AllergyType),
   subtype: allergySubtypeSchema,
-  name: z.string().optional(),
+  name: z.string().optional().nullable(),
   severity: z.enum(["mild", "moderate", "severe"]).optional(),
-  reaction: z.string().optional(),
-  diagnosed: timestampSchema.optional(),
-  notes: z.string().optional(),
+  reaction: z.string().optional().nullable(),
+  diagnosed: timestampSchema.optional().nullable(),
+  notes: z.string().optional().nullable(),
 });
 
 export const vitalStatsSchema = z.object({
@@ -46,7 +46,7 @@ export const vitalStatsSchema = z.object({
 export const blockingConditionSchema = z.object({
   condition: z.nativeEnum(BlockingCondition),
   diagnosedAt: timestampSchema,
-  notes: z.string().optional(),
+  notes: z.string().optional().nullable(),
   isActive: z.boolean(),
 });
 
@@ -54,7 +54,7 @@ export const contraindicationSchema = z.object({
   condition: z.nativeEnum(Contraindication),
   lastOccurrence: timestampSchema,
   frequency: z.enum(["rare", "occasional", "frequent"]),
-  notes: z.string().optional(),
+  notes: z.string().optional().nullable(),
   isActive: z.boolean(),
 });
 
@@ -62,9 +62,9 @@ export const medicationSchema = z.object({
   name: z.string().min(1),
   dosage: z.string().min(1),
   frequency: z.string().min(1),
-  startDate: timestampSchema,
-  endDate: timestampSchema.optional(),
-  prescribedBy: z.string().optional(),
+  startDate: timestampSchema.optional().nullable(),
+  endDate: timestampSchema.optional().nullable(),
+  prescribedBy: z.string().optional().nullable(),
 });
 
 export const patientMedicalInfoSchema = z.object({