diff --git a/Marie/pathways.py b/Marie/pathways.py index b486b88f2ccc9c7d6d095b21e6e17b4cd959bb6b..fba9d64a590c55ef06c7f341f8a7d11f8a741dc9 100644 --- a/Marie/pathways.py +++ b/Marie/pathways.py @@ -239,7 +239,7 @@ class ET_uni(pathwayInjector): care.date_fin = d patient.append(care) if i != nb - 1: - d = d + relativedelta(days=15) + d = d + relativedelta(months=1) return d @@ -424,8 +424,8 @@ class ET_bi(pathwayInjector): seq_type = rd.choice([1,2,3,4], p=[0.5167, 0.4, 0.05, 0.0333]) if seq_type==1: - ET_code_AI = rd.choice(self.code_ET_CIP_L02BA01) - ET_code_Tamoxifen = rd.choice(self.code_ET_CIP_Tamoxifen) + ET_code_AI = rd.choice(self.code_ET_CIP_L02BA01) + ET_code_Tamoxifen = rd.choice(self.code_ET_CIP_Tamoxifen) nb=rd.randint(1,nb_tot-1) for i in range(nb): care = DrugDelivery(ET_code_Tamoxifen, patient, self.sim.pharms[0]) @@ -433,14 +433,14 @@ class ET_bi(pathwayInjector): care.date_fin = d patient.append(care) if i != nb - 1: - d = d + relativedelta(days=15) + d = d + relativedelta(months=1) for i in range(nb_tot-nb): care = DrugDelivery(ET_code_AI, patient, self.sim.pharms[0]) care.date_debut = d care.date_fin = d patient.append(care) if i != nb - 1: - d = d + relativedelta(days=15) + d = d + relativedelta(months=1) elif seq_type==2: @@ -453,18 +453,18 @@ class ET_bi(pathwayInjector): care.date_fin = d patient.append(care) if i != nb - 1: - d = d + relativedelta(days=15) + d = d + relativedelta(months=1) for i in range(nb_tot-nb): care = DrugDelivery(ET_code_Tamoxifen, patient, self.sim.pharms[0]) care.date_debut = d care.date_fin = d patient.append(care) if i != nb - 1: - d = d + relativedelta(days=15) + d = d + relativedelta(months=1) elif seq_type==3: - ET_code_Tamoxifen = rd.choice(self.code_ET_CIP_Tamoxifen) - ET_code_AI = rd.choice(self.code_ET_CIP_agonist) + ET_code_Tamoxifen = rd.choice(self.code_ET_CIP_Tamoxifen) + ET_code_AI = rd.choice(self.code_ET_CIP_agonist) for i in range(nb_tot): # combien de temps ?? care = DrugDelivery(ET_code_Tamoxifen, patient, self.sim.pharms[0]) care.date_debut = d @@ -475,11 +475,11 @@ class ET_bi(pathwayInjector): care.date_fin = d patient.append(care) if i != nb - 1: - d = d + relativedelta(days=15) + d = d + relativedelta(months=1) elif seq_type==4: - ET_code_L02BA01 = rd.choice(self.code_ET_CIP_L02BA01) - ET_code_AI = rd.choice(self.code_ET_CIP_agonist) + ET_code_L02BA01 = rd.choice(self.code_ET_CIP_L02BA01) + ET_code_AI = rd.choice(self.code_ET_CIP_agonist) for i in range(nb_tot): # combien de temps ?? care = DrugDelivery(ET_code_L02BA01, patient, self.sim.pharms[0]) care.date_debut = d @@ -490,7 +490,7 @@ class ET_bi(pathwayInjector): care.date_fin = d patient.append(care) if i != nb - 1: - d = d + relativedelta(days=15) + d = d + relativedelta(months=1) return d