[ATL-54] Fixed issue where the behavior of the demographics checkbox was inconsistent

# Conflicts:
#	src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java

Author: oleg-odysseus

src/main/java/org/ohdsi/webapi/cohortdefinition/GenerationJobExecutionListener.java

@@ -88,8 +88,7 @@ public void afterJob(JobExecution je) {
 			CohortGenerationInfo info = findBySourceId(df, sourceId);
 			setExecutionDurationIfPossible(je, info);
 			info.setStatus(GenerationStatus.COMPLETE);
-            info.setCcGenerateId(je.getId());
-			info.setIsChooseDemographic(info.getCcGenerateId() != null);
+			info.setCcGenerateId(je.getId());
 
 			if (je.getStatus() == BatchStatus.FAILED || je.getStatus() == BatchStatus.STOPPED) {
 				info.setIsValid(false);

src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java

@@ -103,6 +103,7 @@ public JobExecutionResource generateCohortViaJob(UserEntity userEntity, CohortDe
               .orElse(new CohortGenerationInfo(cohortDefinition, source.getSourceId()));
 
       info.setCreatedBy(userEntity);
+      info.setIsChooseDemographic(demographicStat);
 
       cohortDefinition.getGenerationInfoList().add(info);
 
@@ -218,7 +219,7 @@ private JobExecutionResource runGenerateCohortJob(CohortDefinition cohortDefinit
           Boolean demographic) {
       final JobParametersBuilder jobParametersBuilder = getJobParametersBuilder(source, cohortDefinition);
 
-      if (demographic != null && demographic.booleanValue()) {
+      if (demographic != null && demographic) {
          jobParametersBuilder.addString(DEMOGRAPHIC_STATS, Boolean.TRUE.toString());
          Job job = buildJobForCohortGenerationWithDemographic(cohortDefinition, source, jobParametersBuilder);
          return jobService.runJob(job, jobParametersBuilder.toJobParameters());      } else {